summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAshok Raj <ashok.raj@intel.com>2005-06-25 14:54:57 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 16:24:30 -0700
commit52a119feaad92d44a0e97d01b22afbcbaf3fc079 (patch)
treed6ad98d25a0c4a3189af2ad960fe2f47d3eb00f1 /include
parente1367daf3eed5cd619ee88c9907e1e6ddaa58406 (diff)
downloadop-kernel-dev-52a119feaad92d44a0e97d01b22afbcbaf3fc079.zip
op-kernel-dev-52a119feaad92d44a0e97d01b22afbcbaf3fc079.tar.gz
[PATCH] make smp_prepare_cpu to a weak function
I really wish smp_prepare_cpu() would disappear eventually. In the interim this is ideally a weak function, so we dont end up changing several places to define this dummy in headers. Today since the dummy declaration is done only in drivers/base/cpu.c but the function is called in kernel/power/smp.c i get undefined reference in my cpu hotplug code for x86_64 under development. Signed-off-by: Ashok Raj <ashok.raj@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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 c9996ed..edad9b4 100644
--- a/include/asm-i386/smp.h
+++ b/include/asm-i386/smp.h
@@ -51,9 +51,6 @@ extern u8 x86_cpu_to_apicid[];
#ifdef CONFIG_HOTPLUG_CPU
extern void cpu_exit_clear(void);
extern void cpu_uninit(void);
-
-#define __HAVE_ARCH_SMP_PREPARE_CPU
-extern int smp_prepare_cpu(int cpu);
#endif
/*
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index fe0298e..e8904c0 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -69,6 +69,7 @@ extern struct semaphore cpucontrol;
register_cpu_notifier(&fn##_nb); \
}
int cpu_down(unsigned int cpu);
+extern int __attribute__((weak)) smp_prepare_cpu(int cpu);
#define cpu_is_offline(cpu) unlikely(!cpu_online(cpu))
#else
#define lock_cpu_hotplug() do { } while (0)
OpenPOWER on IntegriCloud