2 files changed, 2 insertions, 4 deletions

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index dfbf70e6586..c462cea8ef0 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1093,10 +1093,8 @@ asmlinkage void __init xen_start_kernel(void)
 
         __supported_pte_mask |= _PAGE_IOMAP;
 
-#ifdef CONFIG_X86_64
         /* Work out if we support NX */
-        check_efer();
-#endif
+        x86_configure_nx();
 
         xen_setup_features();
 
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index fe03eeed7b4..738da0cb0d8 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -73,7 +73,7 @@ static __cpuinit void cpu_bringup(void)
 
         xen_setup_cpu_clockevents();
 
-        cpu_set(cpu, cpu_online_map);
+        set_cpu_online(cpu, true);
         percpu_write(cpu_state, CPU_ONLINE);
         wmb();