Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

redo: radix tree test suite: fix compilation

[ This resurrects commit 53855d10f456, which was reverted in
2b41226b39b6. It depended on commit d544abd5ff7d ("lib/radix-tree:
Convert to hotplug state machine") so now it is correct to apply ]

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/1480369871-5271-36-git-send-email-mawilcox@linuxonhyperv.com
Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
Tested-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Matthew Wilcox and committed by
Linus Torvalds
b9a0deb9 8fa9a697

+1 -30
-1
lib/radix-tree.c
··· 31 31 #include <linux/percpu.h> 32 32 #include <linux/slab.h> 33 33 #include <linux/kmemleak.h> 34 - #include <linux/notifier.h> 35 34 #include <linux/cpu.h> 36 35 #include <linux/string.h> 37 36 #include <linux/bitops.h>
+1 -21
tools/testing/radix-tree/linux/cpu.h
··· 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)
-8
tools/testing/radix-tree/linux/notifier.h
··· 1 - #ifndef _NOTIFIER_H 2 - #define _NOTIFIER_H 3 - 4 - struct notifier_block; 5 - 6 - #define NOTIFY_OK 0x0001 /* Suits me */ 7 - 8 - #endif