[PATCH] i386: inline assembler: cleanup and encapsulate descriptor and task register management

i386 inline assembler cleanup.

This change encapsulates descriptor and task register management.  Also,
it is possible to improve assembler generation in two cases; savesegment
may store the value in a register instead of a memory location, which
allows GCC to optimize stack variables into registers, and MOV MEM, SEG
is always a 16-bit write to memory, making the casting in math-emu
unnecessary.

Signed-off-by: Zachary Amsden <zach@vmware.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

7 files changed, 15 insertions, 15 deletions

diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index 361f2e7ccb12..46ce9b248f55 100644
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -613,8 +613,8 @@ void __devinit cpu_init(void)
         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));
+        load_gdt(&cpu_gdt_descr[cpu]);
+        load_idt(&idt_descr);
 
         /*
          * Delete NT
diff --git a/arch/i386/kernel/doublefault.c b/arch/i386/kernel/doublefault.c
index 789af3e9fb1f..5edb1d379add 100644
--- a/arch/i386/kernel/doublefault.c
+++ b/arch/i386/kernel/doublefault.c
@@ -20,7 +20,7 @@ static void doublefault_fn(void)
         struct Xgt_desc_struct gdt_desc = {0, 0};
         unsigned long gdt, tss;
 
-        __asm__ __volatile__("sgdt %0": "=m" (gdt_desc): :"memory");
+        store_gdt(&gdt_desc);
         gdt = gdt_desc.address;
 
         printk("double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index 921fdb15fc9b..ecad519fd395 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -104,8 +104,7 @@ static void efi_call_phys_prelog(void)
         local_flush_tlb();
 
         cpu_gdt_descr[0].address = __pa(cpu_gdt_descr[0].address);
-        __asm__ __volatile__("lgdt %0":"=m"
-                            (*(struct Xgt_desc_struct *) __pa(&cpu_gdt_descr[0])));
+        load_gdt((struct Xgt_desc_struct *) __pa(&cpu_gdt_descr[0]));
 }
 
 static void efi_call_phys_epilog(void)
@@ -114,7 +113,7 @@ static void efi_call_phys_epilog(void)
 
         cpu_gdt_descr[0].address =
                 (unsigned long) __va(cpu_gdt_descr[0].address);
-        __asm__ __volatile__("lgdt %0":"=m"(cpu_gdt_descr));
+        load_gdt(&cpu_gdt_descr[0]);
         cr4 = read_cr4();
 
         if (cr4 & X86_CR4_PSE) {
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c
index c71fef31dc47..1cbb9c0f4704 100644
--- a/arch/i386/kernel/reboot.c
+++ b/arch/i386/kernel/reboot.c
@@ -13,6 +13,7 @@
 #include <linux/dmi.h>
 #include <asm/uaccess.h>
 #include <asm/apic.h>
+#include <asm/desc.h>
 #include "mach_reboot.h"
 #include <linux/reboot_fixups.h>
 
@@ -242,13 +243,13 @@ void machine_real_restart(unsigned char *code, int length)
 
         /* Set up the IDT for real mode. */
 
-        __asm__ __volatile__ ("lidt %0" : : "m" (real_mode_idt));
+        load_idt(&real_mode_idt);
 
         /* Set up a GDT from which we can load segment descriptors for real
            mode.  The GDT is not used in real mode; it is just needed here to
            prepare the descriptors. */
 
-        __asm__ __volatile__ ("lgdt %0" : : "m" (real_mode_gdt));
+        load_gdt(&real_mode_gdt);
 
         /* Load the data segment registers, and thus the descriptors ready for
            real mode.  The base address of each segment is 0x100, 16 times the
@@ -316,7 +317,7 @@ void machine_emergency_restart(void)
         if (!reboot_thru_bios) {
                 if (efi_enabled) {
                         efi.reset_system(EFI_RESET_COLD, EFI_SUCCESS, 0, NULL);
-                        __asm__ __volatile__("lidt %0": :"m" (no_idt));
+                        load_idt(&no_idt);
                         __asm__ __volatile__("int3");
                 }
                 /* rebooting needs to touch the page at absolute addr 0 */
@@ -325,7 +326,7 @@ void machine_emergency_restart(void)
                         mach_reboot_fixups(); /* for board specific fixups */
                         mach_reboot();
                         /* That didn't work - force a triple fault.. */
-                        __asm__ __volatile__("lidt %0": :"m" (no_idt));
+                        load_idt(&no_idt);
                         __asm__ __volatile__("int3");
                 }
         }
diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c
index 140e340569c6..7bcda6d69d87 100644
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
@@ -278,9 +278,9 @@ setup_sigcontext(struct sigcontext __user *sc, struct _fpstate __user *fpstate,
         int tmp, err = 0;
 
         tmp = 0;
-        __asm__("movl %%gs,%0" : "=r"(tmp): "0"(tmp));
+        savesegment(gs, tmp);
         err |= __put_user(tmp, (unsigned int __user *)&sc->gs);
-        __asm__("movl %%fs,%0" : "=r"(tmp): "0"(tmp));
+        savesegment(fs, tmp);
         err |= __put_user(tmp, (unsigned int __user *)&sc->fs);
 
         err |= __put_user(regs->xes, (unsigned int __user *)&sc->es);
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index cd2d5d5514fe..1144df0c48d6 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -1008,7 +1008,7 @@ void __init trap_init_f00f_bug(void)
          * it uses the read-only mapped virtual address.
          */
         idt_descr.address = fix_to_virt(FIX_F00F_IDT);
-        __asm__ __volatile__("lidt %0" : : "m" (idt_descr));
+        load_idt(&idt_descr);
 }
 #endif
 
diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c
index 2daa06fb4a88..16b485009622 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86.c
@@ -294,8 +294,8 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
  */
         info->regs32->eax = 0;
         tsk->thread.saved_esp0 = tsk->thread.esp0;
-        asm volatile("mov %%fs,%0":"=m" (tsk->thread.saved_fs));
-        asm volatile("mov %%gs,%0":"=m" (tsk->thread.saved_gs));
+        savesegment(fs, tsk->thread.saved_fs);
+        savesegment(gs, tsk->thread.saved_gs);
 
         tss = &per_cpu(init_tss, get_cpu());
         tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;