x86, 32-bit: trim memory not covered by wb mtrrs

[deliverable/linux.git] / arch / x86 / kernel / smpcommon_32.c

diff --git a/arch/x86/kernel/smpcommon_32.c b/arch/x86/kernel/smpcommon_32.c
index bbfe85a0f699b198008445182430f2848843699c..8bc38af29aef54aabc6f5b909273e0d13915dd9f 100644 (file)
--- a/arch/x86/kernel/smpcommon_32.c
+++ b/arch/x86/kernel/smpcommon_32.c
@@ -14,10 +14,11 @@ __cpuinit void init_gdt(int cpu)
 {
        struct desc_struct *gdt = get_cpu_gdt_table(cpu);
 
-       pack_descriptor((u32 *)&gdt[GDT_ENTRY_PERCPU].a,
-                       (u32 *)&gdt[GDT_ENTRY_PERCPU].b,
+       pack_descriptor(&gdt[GDT_ENTRY_PERCPU],
                        __per_cpu_offset[cpu], 0xFFFFF,
-                       0x80 | DESCTYPE_S | 0x2, 0x8);
+                       0x2 | DESCTYPE_S, 0x8);
+
+       gdt[GDT_ENTRY_PERCPU].s = 1;
 
        per_cpu(this_cpu_off, cpu) = __per_cpu_offset[cpu];
        per_cpu(cpu_number, cpu) = cpu;