aboutsummaryrefslogtreecommitdiffstats
path: root/xen/include/xen/smp.h
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-02-16 16:31:22 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-02-16 16:31:22 +0100
commit0510339782be95981d02c8bd52bafd6ebf90b394 (patch)
treefca074cadd992fb11df036a22d8ff8626c463d0d /xen/include/xen/smp.h
parent5f3c901acc28bf701a37cbc9b0d014a82129fbab (diff)
downloadxen-0510339782be95981d02c8bd52bafd6ebf90b394.tar.gz
xen-0510339782be95981d02c8bd52bafd6ebf90b394.tar.bz2
xen-0510339782be95981d02c8bd52bafd6ebf90b394.zip
Upgrade smpboot.c to linux-2.6.16-rc2 codebase.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/include/xen/smp.h')
-rw-r--r--xen/include/xen/smp.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/xen/include/xen/smp.h b/xen/include/xen/smp.h
index a99ea486f6..f64c5b056d 100644
--- a/xen/include/xen/smp.h
+++ b/xen/include/xen/smp.h
@@ -86,9 +86,7 @@ void smp_prepare_boot_cpu(void);
#define smp_send_event_check_mask(m) ((void)0)
#define smp_send_event_check_cpu(p) ((void)0)
-#ifndef __smp_processor_id
-#define smp_processor_id() 0
-#endif
+#define raw_smp_processor_id() 0
#define hard_smp_processor_id() 0
#define smp_call_function(func,info,retry,wait) ({ do {} while (0); 0; })
#define on_each_cpu(func,info,retry,wait) ({ func(info); 0; })
@@ -97,10 +95,6 @@ void smp_prepare_boot_cpu(void);
#endif
-#ifdef __smp_processor_id
-#define smp_processor_id() __smp_processor_id()
-#else
-extern unsigned int smp_processor_id(void);
-#endif
+#define smp_processor_id() raw_smp_processor_id()
#endif