Skip to content

Commit 2b41226

Browse files
committed
Revert "radix tree test suite: fix compilation"
This reverts commit 53855d1. It shouldn't have come in yet - it depends on the changes in linux-next that will come in during the next merge window. As Matthew Wilcox says, the test suite is broken with the current state without the revert. Requested-by: Matthew Wilcox <mawilcox@microsoft.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent a37102d commit 2b41226

3 files changed

Lines changed: 30 additions & 1 deletion

File tree

lib/radix-tree.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <linux/percpu.h>
3131
#include <linux/slab.h>
3232
#include <linux/kmemleak.h>
33+
#include <linux/notifier.h>
3334
#include <linux/cpu.h>
3435
#include <linux/string.h>
3536
#include <linux/bitops.h>
Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1-
#define cpuhp_setup_state_nocalls(a, b, c, d) (0)
1+
2+
#define hotcpu_notifier(a, b)
3+
4+
#define CPU_ONLINE 0x0002 /* CPU (unsigned)v is up */
5+
#define CPU_UP_PREPARE 0x0003 /* CPU (unsigned)v coming up */
6+
#define CPU_UP_CANCELED 0x0004 /* CPU (unsigned)v NOT coming up */
7+
#define CPU_DOWN_PREPARE 0x0005 /* CPU (unsigned)v going down */
8+
#define CPU_DOWN_FAILED 0x0006 /* CPU (unsigned)v NOT going down */
9+
#define CPU_DEAD 0x0007 /* CPU (unsigned)v dead */
10+
#define CPU_POST_DEAD 0x0009 /* CPU (unsigned)v dead, cpu_hotplug
11+
* lock is dropped */
12+
#define CPU_BROKEN 0x000C /* CPU (unsigned)v did not die properly,
13+
* perhaps due to preemption. */
14+
#define CPU_TASKS_FROZEN 0x0010
15+
16+
#define CPU_ONLINE_FROZEN (CPU_ONLINE | CPU_TASKS_FROZEN)
17+
#define CPU_UP_PREPARE_FROZEN (CPU_UP_PREPARE | CPU_TASKS_FROZEN)
18+
#define CPU_UP_CANCELED_FROZEN (CPU_UP_CANCELED | CPU_TASKS_FROZEN)
19+
#define CPU_DOWN_PREPARE_FROZEN (CPU_DOWN_PREPARE | CPU_TASKS_FROZEN)
20+
#define CPU_DOWN_FAILED_FROZEN (CPU_DOWN_FAILED | CPU_TASKS_FROZEN)
21+
#define CPU_DEAD_FROZEN (CPU_DEAD | CPU_TASKS_FROZEN)
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#ifndef _NOTIFIER_H
2+
#define _NOTIFIER_H
3+
4+
struct notifier_block;
5+
6+
#define NOTIFY_OK 0x0001 /* Suits me */
7+
8+
#endif

0 commit comments

Comments
 (0)