[PATCH] x86: add an accessor function for getting the per-CPU gdt

[net-next-2.6.git] / arch / i386 / kernel / apm.c

diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index d7811c4e8b509b30fa5fd15f822d94ebddb0d82c..d2ef0c2aa93e462df516ec6e78c8473bed7c56b7 100644 (file)
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -597,12 +597,14 @@ static u8 apm_bios_call(u32 func, u32 ebx_in, u32 ecx_in,
        cpumask_t               cpus;
        int                     cpu;
        struct desc_struct      save_desc_40;
+       struct desc_struct      *gdt;
 
        cpus = apm_save_cpus();
        
        cpu = get_cpu();
-       save_desc_40 = per_cpu(cpu_gdt_table, cpu)[0x40 / 8];
-       per_cpu(cpu_gdt_table, cpu)[0x40 / 8] = bad_bios_desc;
+       gdt = get_cpu_gdt_table(cpu);
+       save_desc_40 = gdt[0x40 / 8];
+       gdt[0x40 / 8] = bad_bios_desc;
 
        local_save_flags(flags);
        APM_DO_CLI;
@@ -610,7 +612,7 @@ static u8 apm_bios_call(u32 func, u32 ebx_in, u32 ecx_in,
        apm_bios_call_asm(func, ebx_in, ecx_in, eax, ebx, ecx, edx, esi);
        APM_DO_RESTORE_SEGS;
        local_irq_restore(flags);
-       per_cpu(cpu_gdt_table, cpu)[0x40 / 8] = save_desc_40;
+       gdt[0x40 / 8] = save_desc_40;
        put_cpu();
        apm_restore_cpus(cpus);
        
@@ -639,13 +641,14 @@ static u8 apm_bios_call_simple(u32 func, u32 ebx_in, u32 ecx_in, u32 *eax)
        cpumask_t               cpus;
        int                     cpu;
        struct desc_struct      save_desc_40;
-
+       struct desc_struct      *gdt;
 
        cpus = apm_save_cpus();
        
        cpu = get_cpu();
-       save_desc_40 = per_cpu(cpu_gdt_table, cpu)[0x40 / 8];
-       per_cpu(cpu_gdt_table, cpu)[0x40 / 8] = bad_bios_desc;
+       gdt = get_cpu_gdt_table(cpu);
+       save_desc_40 = gdt[0x40 / 8];
+       gdt[0x40 / 8] = bad_bios_desc;
 
        local_save_flags(flags);
        APM_DO_CLI;
@@ -653,7 +656,7 @@ static u8 apm_bios_call_simple(u32 func, u32 ebx_in, u32 ecx_in, u32 *eax)
        error = apm_bios_call_simple_asm(func, ebx_in, ecx_in, eax);
        APM_DO_RESTORE_SEGS;
        local_irq_restore(flags);
-       __get_cpu_var(cpu_gdt_table)[0x40 / 8] = save_desc_40;
+       gdt[0x40 / 8] = save_desc_40;
        put_cpu();
        apm_restore_cpus(cpus);
        return error;
@@ -2295,35 +2298,36 @@ static int __init apm_init(void)
        apm_bios_entry.segment = APM_CS;
 
        for (i = 0; i < NR_CPUS; i++) {
-               set_base(per_cpu(cpu_gdt_table, i)[APM_CS >> 3],
+               struct desc_struct *gdt = get_cpu_gdt_table(i);
+               set_base(gdt[APM_CS >> 3],
                         __va((unsigned long)apm_info.bios.cseg << 4));
-               set_base(per_cpu(cpu_gdt_table, i)[APM_CS_16 >> 3],
+               set_base(gdt[APM_CS_16 >> 3],
                         __va((unsigned long)apm_info.bios.cseg_16 << 4));
-               set_base(per_cpu(cpu_gdt_table, i)[APM_DS >> 3],
+               set_base(gdt[APM_DS >> 3],
                         __va((unsigned long)apm_info.bios.dseg << 4));
 #ifndef APM_RELAX_SEGMENTS
                if (apm_info.bios.version == 0x100) {
 #endif
                        /* For ASUS motherboard, Award BIOS rev 110 (and others?) */
-                       _set_limit((char *)&per_cpu(cpu_gdt_table, i)[APM_CS >> 3], 64 * 1024 - 1);
+                       _set_limit((char *)&gdt[APM_CS >> 3], 64 * 1024 - 1);
                        /* For some unknown machine. */
-                       _set_limit((char *)&per_cpu(cpu_gdt_table, i)[APM_CS_16 >> 3], 64 * 1024 - 1);
+                       _set_limit((char *)&gdt[APM_CS_16 >> 3], 64 * 1024 - 1);
                        /* For the DEC Hinote Ultra CT475 (and others?) */
-                       _set_limit((char *)&per_cpu(cpu_gdt_table, i)[APM_DS >> 3], 64 * 1024 - 1);
+                       _set_limit((char *)&gdt[APM_DS >> 3], 64 * 1024 - 1);
 #ifndef APM_RELAX_SEGMENTS
                } else {
-                       _set_limit((char *)&per_cpu(cpu_gdt_table, i)[APM_CS >> 3],
+                       _set_limit((char *)&gdt[APM_CS >> 3],
                                (apm_info.bios.cseg_len - 1) & 0xffff);
-                       _set_limit((char *)&per_cpu(cpu_gdt_table, i)[APM_CS_16 >> 3],
+                       _set_limit((char *)&gdt[APM_CS_16 >> 3],
                                (apm_info.bios.cseg_16_len - 1) & 0xffff);
-                       _set_limit((char *)&per_cpu(cpu_gdt_table, i)[APM_DS >> 3],
+                       _set_limit((char *)&gdt[APM_DS >> 3],
                                (apm_info.bios.dseg_len - 1) & 0xffff);
                      /* workaround for broken BIOSes */
                        if (apm_info.bios.cseg_len <= apm_info.bios.offset)
-                               _set_limit((char *)&per_cpu(cpu_gdt_table, i)[APM_CS >> 3], 64 * 1024 -1);
+                               _set_limit((char *)&gdt[APM_CS >> 3], 64 * 1024 -1);
                        if (apm_info.bios.dseg_len <= 0x40) { /* 0x40 * 4kB == 64kB */
                                /* for the BIOS that assumes granularity = 1 */
-                               per_cpu(cpu_gdt_table, i)[APM_DS >> 3].b |= 0x800000;
+                               gdt[APM_DS >> 3].b |= 0x800000;
                                printk(KERN_NOTICE "apm: we set the granularity of dseg.\n");
                        }
                }