Skip to content

Commit 53855d1

Browse files
Matthew Wilcoxtorvalds
Matthew Wilcox
authored andcommitted
radix tree test suite: fix compilation
Patch "lib/radix-tree: Convert to hotplug state machine" breaks the test suite as it adds a call to cpuhp_setup_state_nocalls() which is not currently emulated in the test suite. Add it, and delete the emulation of the old CPU hotplug mechanism. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Matthew Wilcox <[email protected]> Tested-by: Kirill A. Shutemov <[email protected]> Cc: Konstantin Khlebnikov <[email protected]> Cc: Ross Zwisler <[email protected]> Cc: Matthew Wilcox <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 5c7e9cc commit 53855d1

File tree

3 files changed

+1
-30
lines changed

3 files changed

+1
-30
lines changed

lib/radix-tree.c

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <linux/percpu.h>
3131
#include <linux/slab.h>
3232
#include <linux/kmemleak.h>
33-
#include <linux/notifier.h>
3433
#include <linux/cpu.h>
3534
#include <linux/string.h>
3635
#include <linux/bitops.h>

tools/testing/radix-tree/linux/cpu.h

+1-21
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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)
1+
#define cpuhp_setup_state_nocalls(a, b, c, d) (0)

tools/testing/radix-tree/linux/notifier.h

-8
This file was deleted.

0 commit comments

Comments
 (0)