aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-i386/smp.h3
-rw-r--r--include/linux/cpu.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h
index c9996eda5408..edad9b4712fa 100644
--- a/include/asm-i386/smp.h
+++ b/include/asm-i386/smp.h
@@ -51,9 +51,6 @@ extern u8 x86_cpu_to_apicid[];
51#ifdef CONFIG_HOTPLUG_CPU 51#ifdef CONFIG_HOTPLUG_CPU
52extern void cpu_exit_clear(void); 52extern void cpu_exit_clear(void);
53extern void cpu_uninit(void); 53extern void cpu_uninit(void);
54
55#define __HAVE_ARCH_SMP_PREPARE_CPU
56extern int smp_prepare_cpu(int cpu);
57#endif 54#endif
58 55
59/* 56/*
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index fe0298e5dae1..e8904c0da686 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -69,6 +69,7 @@ extern struct semaphore cpucontrol;
69 register_cpu_notifier(&fn##_nb); \ 69 register_cpu_notifier(&fn##_nb); \
70} 70}
71int cpu_down(unsigned int cpu); 71int cpu_down(unsigned int cpu);
72extern int __attribute__((weak)) smp_prepare_cpu(int cpu);
72#define cpu_is_offline(cpu) unlikely(!cpu_online(cpu)) 73#define cpu_is_offline(cpu) unlikely(!cpu_online(cpu))
73#else 74#else
74#define lock_cpu_hotplug() do { } while (0) 75#define lock_cpu_hotplug() do { } while (0)