Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 0 insertions, 4 deletions

diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
index bd1dbf3bd223..a22a866de8f9 100644
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
@@ -726,15 +726,11 @@ __setup("apic=", apic_set_verbosity);
 static int __init detect_init_APIC (void)
 {
         u32 h, l, features;
-        extern void get_cpu_vendor(struct cpuinfo_x86*);
 
         /* Disabled by kernel option? */
         if (enable_local_apic < 0)
                 return -1;
 
-        /* Workaround for us being called before identify_cpu(). */
-        get_cpu_vendor(&boot_cpu_data);
-
         switch (boot_cpu_data.x86_vendor) {
         case X86_VENDOR_AMD:
                 if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) ||