xen64: smp.c compile hacking

[linux-2.6-omap-h63xx.git] / arch / x86 / xen / setup.c

diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index e0a39595bde3b342c8364a4306f3b8ea61d88def..f52f3855fb6b23d3b9dc81cbc44c3e34b47e2cde 100644 (file)
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -98,7 +98,7 @@ void xen_enable_sysenter(void)
        /* Mask events on entry, even though they get enabled immediately */
        static struct callback_register sysenter = {
                .type = CALLBACKTYPE_sysenter,
-               .address = { __KERNEL_CS, (unsigned long)xen_sysenter_target },
+               .address = XEN_CALLBACK(__KERNEL_CS, xen_sysenter_target),
                .flags = CALLBACKF_mask_events,
        };
 
@@ -143,11 +143,6 @@ void __init xen_arch_setup(void)
 
        pm_idle = xen_idle;
 
-#ifdef CONFIG_SMP
-       /* fill cpus_possible with all available cpus */
-       xen_fill_possible_map();
-#endif
-
        paravirt_disable_iospace();
 
        fiddle_vdso();