aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/smp.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-13 11:05:58 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-13 11:05:58 +0100
commitcd80a8142efa3468c2cd9fb52845f334c3220d54 (patch)
tree919e88994bd3c09b34ce852d0a09bb0655d231d0 /include/linux/smp.h
parentgeneric-ipi: eliminate WARN_ON()s during oops/panic (diff)
parentMerge branches 'x86/asm', 'x86/debug', 'x86/mm', 'x86/setup', 'x86/urgent' and 'linus' into x86/core (diff)
downloadlinux-dev-cd80a8142efa3468c2cd9fb52845f334c3220d54.tar.xz
linux-dev-cd80a8142efa3468c2cd9fb52845f334c3220d54.zip
Merge branch 'x86/core' into core/ipi
Diffstat (limited to 'include/linux/smp.h')
-rw-r--r--include/linux/smp.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 00866d7fdf34..2d3bcb6b37ff 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -177,6 +177,12 @@ static inline void init_call_single_data(void)
#define put_cpu() preempt_enable()
#define put_cpu_no_resched() preempt_enable_no_resched()
+/*
+ * Callback to arch code if there's nosmp or maxcpus=0 on the
+ * boot command line:
+ */
+extern void arch_disable_smp_support(void);
+
void smp_setup_processor_id(void);
#endif /* __LINUX_SMP_H */