Merge branch 'linus' into x86/x2apic
[sfrench/cifs-2.6.git] / arch / x86 / kernel / setup.c
index 531b55b8e81a1de1827eac5691d5f8aef1d8d10c..6121ffd46b9eb587ebbd7e380eadb29f698ec638 100644 (file)
@@ -735,6 +735,8 @@ void __init setup_arch(char **cmdline_p)
        num_physpages = max_pfn;
 
        check_efer();
+       if (cpu_has_x2apic)
+               check_x2apic();
 
        /* How many end-of-memory variables you have, grandma! */
        /* need this before calling reserve_initrd */