Commit 53855d10 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds
Browse files

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/1480369871-5271-36-git-send-email-mawilcox@linuxonhyperv.com


Signed-off-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
Tested-by: default avatarKirill 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5c7e9ccd

lib/radix-tree.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/percpu.h>

#include <linux/slab.h>

#include <linux/kmemleak.h>

#include <linux/notifier.h>

#include <linux/cpu.h>

#include <linux/string.h>

#include <linux/bitops.h>

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

+1 −21
Original line number Diff line number Diff line 


#define hotcpu_notifier(a, b)



#define CPU_ONLINE		0x0002 /* CPU (unsigned)v is up */

#define CPU_UP_PREPARE		0x0003 /* CPU (unsigned)v coming up */

#define CPU_UP_CANCELED		0x0004 /* CPU (unsigned)v NOT coming up */

#define CPU_DOWN_PREPARE	0x0005 /* CPU (unsigned)v going down */

#define CPU_DOWN_FAILED		0x0006 /* CPU (unsigned)v NOT going down */

#define CPU_DEAD		0x0007 /* CPU (unsigned)v dead */

#define CPU_POST_DEAD		0x0009 /* CPU (unsigned)v dead, cpu_hotplug

					* lock is dropped */

#define CPU_BROKEN		0x000C /* CPU (unsigned)v did not die properly,

					* perhaps due to preemption. */

#define CPU_TASKS_FROZEN	0x0010



#define CPU_ONLINE_FROZEN	(CPU_ONLINE | CPU_TASKS_FROZEN)

#define CPU_UP_PREPARE_FROZEN	(CPU_UP_PREPARE | CPU_TASKS_FROZEN)

#define CPU_UP_CANCELED_FROZEN  (CPU_UP_CANCELED | CPU_TASKS_FROZEN)

#define CPU_DOWN_PREPARE_FROZEN (CPU_DOWN_PREPARE | CPU_TASKS_FROZEN)

#define CPU_DOWN_FAILED_FROZEN  (CPU_DOWN_FAILED | CPU_TASKS_FROZEN)

#define CPU_DEAD_FROZEN		(CPU_DEAD | CPU_TASKS_FROZEN)
 
#define cpuhp_setup_state_nocalls(a, b, c, d)	(0)

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

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
#ifndef _NOTIFIER_H

#define _NOTIFIER_H



struct notifier_block;



#define NOTIFY_OK              0x0001          /* Suits me */



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE