vserver 1.9.3

[linux-2.6.git] / arch / i386 / kernel / cpu / common.c

diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index fbb6a59..89dc79a 100644 (file)
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -2,6 +2,8 @@
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/smp.h>
+#include <linux/module.h>
+#include <linux/percpu.h>
 #include <asm/semaphore.h>
 #include <asm/processor.h>
 #include <asm/i387.h>
@@ -11,6 +13,9 @@
 
 #include "cpu.h"
 
+DEFINE_PER_CPU(struct desc_struct, cpu_gdt_table[GDT_ENTRIES]);
+EXPORT_PER_CPU_SYMBOL(cpu_gdt_table);
+
 static int cachesize_override __initdata = -1;
 static int disable_x86_fxsr __initdata = 0;
 static int disable_x86_serial_nr __initdata = 1;
@@ -329,7 +334,7 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
 
        generic_identify(c);
 
-       printk(KERN_DEBUG "CPU:     After generic identify, caps: %08lx %08lx %08lx %08lx\n",
+       printk(KERN_DEBUG "CPU: After generic identify, caps: %08lx %08lx %08lx %08lx\n",
                c->x86_capability[0],
                c->x86_capability[1],
                c->x86_capability[2],
@@ -338,7 +343,7 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
        if (this_cpu->c_identify) {
                this_cpu->c_identify(c);
 
-       printk(KERN_DEBUG "CPU:     After vendor identify, caps: %08lx %08lx %08lx %08lx\n",
+       printk(KERN_DEBUG "CPU: After vendor identify, caps:  %08lx %08lx %08lx %08lx\n",
                c->x86_capability[0],
                c->x86_capability[1],
                c->x86_capability[2],
@@ -393,7 +398,7 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
 
        /* Now the feature flags better reflect actual CPU features! */
 
-       printk(KERN_DEBUG "CPU:     After all inits, caps: %08lx %08lx %08lx %08lx\n",
+       printk(KERN_DEBUG "CPU: After all inits, caps:        %08lx %08lx %08lx %08lx\n",
               c->x86_capability[0],
               c->x86_capability[1],
               c->x86_capability[2],
@@ -473,7 +478,6 @@ void early_cpu_detect(void);
 
 void __init early_cpu_init(void)
 {
-       early_cpu_detect();
        intel_cpu_init();
        cyrix_init_cpu();
        nsc_init_cpu();
@@ -483,6 +487,7 @@ void __init early_cpu_init(void)
        rise_init_cpu();
        nexgen_init_cpu();
        umc_init_cpu();
+       early_cpu_detect();
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
        /* pse is not compatible with on-the-fly unmapping,
@@ -501,7 +506,7 @@ void __init early_cpu_init(void)
 void __init cpu_init (void)
 {
        int cpu = smp_processor_id();
-       struct tss_struct * t = init_tss + cpu;
+       struct tss_struct * t = &per_cpu(init_tss, cpu);
        struct thread_struct *thread = &current->thread;
 
        if (test_and_set_bit(cpu, &cpu_initialized)) {
@@ -523,15 +528,17 @@ void __init cpu_init (void)
         * Initialize the per-CPU GDT with the boot GDT,
         * and set up the GDT descriptor:
         */
-       if (cpu) {
-               memcpy(cpu_gdt_table[cpu], cpu_gdt_table[0], GDT_SIZE);
-               cpu_gdt_descr[cpu].size = GDT_SIZE - 1;
-               cpu_gdt_descr[cpu].address = (unsigned long)cpu_gdt_table[cpu];
-       }
+       memcpy(&per_cpu(cpu_gdt_table, cpu), cpu_gdt_table,
+              GDT_SIZE);
+       cpu_gdt_descr[cpu].size = GDT_SIZE - 1;
+       cpu_gdt_descr[cpu].address =
+           (unsigned long)&per_cpu(cpu_gdt_table, cpu);
+
        /*
         * Set up the per-thread TLS descriptor cache:
         */
-       memcpy(thread->tls_array, cpu_gdt_table[cpu], GDT_ENTRY_TLS_ENTRIES * 8);
+       memcpy(thread->tls_array, &per_cpu(cpu_gdt_table, cpu),
+               GDT_ENTRY_TLS_ENTRIES * 8);
 
        __asm__ __volatile__("lgdt %0" : : "m" (cpu_gdt_descr[cpu]));
        __asm__ __volatile__("lidt %0" : : "m" (idt_descr));
@@ -552,13 +559,11 @@ void __init cpu_init (void)
 
        load_esp0(t, thread);
        set_tss_desc(cpu,t);
-       cpu_gdt_table[cpu][GDT_ENTRY_TSS].b &= 0xfffffdff;
        load_TR_desc();
        load_LDT(&init_mm.context);
 
        /* Set up doublefault TSS pointer in the GDT */
        __set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss);
-       cpu_gdt_table[cpu][GDT_ENTRY_DOUBLEFAULT_TSS].b &= 0xfffffdff;
 
        /* Clear %fs and %gs. */
        asm volatile ("xorl %eax, %eax; movl %eax, %fs; movl %eax, %gs");