From: Zachary Amsden Some more assembler cleanups I noticed along the way. Signed-off-by: Zachary Amsden Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton --- arch/i386/kernel/cpu/intel.c | 9 +++------ arch/i386/kernel/crash.c | 2 +- arch/i386/kernel/machine_kexec.c | 10 ++-------- arch/i386/kernel/msr.c | 31 ++++++------------------------- arch/i386/kernel/process.c | 2 +- arch/i386/mach-voyager/voyager_basic.c | 14 ++++++-------- arch/i386/mach-voyager/voyager_smp.c | 2 +- include/asm-i386/msr.h | 15 +++++++++++++++ 8 files changed, 35 insertions(+), 50 deletions(-) diff -puN arch/i386/kernel/cpu/intel.c~x86-more-asm-cleanups arch/i386/kernel/cpu/intel.c --- devel/arch/i386/kernel/cpu/intel.c~x86-more-asm-cleanups 2005-08-03 23:06:19.000000000 -0700 +++ devel-akpm/arch/i386/kernel/cpu/intel.c 2005-08-03 23:06:19.000000000 -0700 @@ -82,16 +82,13 @@ static void __devinit Intel_errata_worka */ static int __devinit num_cpu_cores(struct cpuinfo_x86 *c) { - unsigned int eax; + unsigned int eax, ebx, ecx, edx; if (c->cpuid_level < 4) return 1; - __asm__("cpuid" - : "=a" (eax) - : "0" (4), "c" (0) - : "bx", "dx"); - + /* Intel has a non-standard dependency on %ecx for this CPUID level. */ + cpuid_count(4, 0, &eax, &ebx, &ecx, &edx); if (eax & 0x1f) return ((eax >> 26) + 1); else diff -puN arch/i386/kernel/crash.c~x86-more-asm-cleanups arch/i386/kernel/crash.c --- devel/arch/i386/kernel/crash.c~x86-more-asm-cleanups 2005-08-03 23:06:19.000000000 -0700 +++ devel-akpm/arch/i386/kernel/crash.c 2005-08-03 23:06:19.000000000 -0700 @@ -153,7 +153,7 @@ static int crash_nmi_callback(struct pt_ disable_local_APIC(); atomic_dec(&waiting_for_crash_ipi); /* Assume hlt works */ - __asm__("hlt"); + halt(); for(;;); return 1; diff -puN arch/i386/kernel/machine_kexec.c~x86-more-asm-cleanups arch/i386/kernel/machine_kexec.c --- devel/arch/i386/kernel/machine_kexec.c~x86-more-asm-cleanups 2005-08-03 23:06:19.000000000 -0700 +++ devel-akpm/arch/i386/kernel/machine_kexec.c 2005-08-03 23:06:19.000000000 -0700 @@ -93,10 +93,7 @@ static void set_idt(void *newidt, __u16 curidt.size = limit; curidt.address = (unsigned long)newidt; - __asm__ __volatile__ ( - "lidtl %0\n" - : : "m" (curidt) - ); + load_idt(&curidt); }; @@ -108,10 +105,7 @@ static void set_gdt(void *newgdt, __u16 curgdt.size = limit; curgdt.address = (unsigned long)newgdt; - __asm__ __volatile__ ( - "lgdtl %0\n" - : : "m" (curgdt) - ); + load_gdt(&curgdt); }; static void load_segments(void) diff -puN arch/i386/kernel/msr.c~x86-more-asm-cleanups arch/i386/kernel/msr.c --- devel/arch/i386/kernel/msr.c~x86-more-asm-cleanups 2005-08-03 23:06:19.000000000 -0700 +++ devel-akpm/arch/i386/kernel/msr.c 2005-08-03 23:06:19.000000000 -0700 @@ -46,23 +46,13 @@ static struct class *msr_class; -/* Note: "err" is handled in a funny way below. Otherwise one version - of gcc or another breaks. */ - static inline int wrmsr_eio(u32 reg, u32 eax, u32 edx) { int err; - asm volatile ("1: wrmsr\n" - "2:\n" - ".section .fixup,\"ax\"\n" - "3: movl %4,%0\n" - " jmp 2b\n" - ".previous\n" - ".section __ex_table,\"a\"\n" - " .align 4\n" " .long 1b,3b\n" ".previous":"=&bDS" (err) - :"a"(eax), "d"(edx), "c"(reg), "i"(-EIO), "0"(0)); - + err = wrmsr_safe(reg, eax, edx); + if (err) + err = -EIO; return err; } @@ -70,18 +60,9 @@ static inline int rdmsr_eio(u32 reg, u32 { int err; - asm volatile ("1: rdmsr\n" - "2:\n" - ".section .fixup,\"ax\"\n" - "3: movl %4,%0\n" - " jmp 2b\n" - ".previous\n" - ".section __ex_table,\"a\"\n" - " .align 4\n" - " .long 1b,3b\n" - ".previous":"=&bDS" (err), "=a"(*eax), "=d"(*edx) - :"c"(reg), "i"(-EIO), "0"(0)); - + err = rdmsr_safe(reg, eax, edx); + if (err) + err = -EIO; return err; } diff -puN arch/i386/kernel/process.c~x86-more-asm-cleanups arch/i386/kernel/process.c --- devel/arch/i386/kernel/process.c~x86-more-asm-cleanups 2005-08-03 23:06:19.000000000 -0700 +++ devel-akpm/arch/i386/kernel/process.c 2005-08-03 23:06:19.000000000 -0700 @@ -164,7 +164,7 @@ static inline void play_dead(void) */ local_irq_disable(); while (1) - __asm__ __volatile__("hlt":::"memory"); + halt(); } #else static inline void play_dead(void) diff -puN arch/i386/mach-voyager/voyager_basic.c~x86-more-asm-cleanups arch/i386/mach-voyager/voyager_basic.c --- devel/arch/i386/mach-voyager/voyager_basic.c~x86-more-asm-cleanups 2005-08-03 23:06:19.000000000 -0700 +++ devel-akpm/arch/i386/mach-voyager/voyager_basic.c 2005-08-03 23:06:19.000000000 -0700 @@ -234,10 +234,9 @@ voyager_power_off(void) #endif } /* and wait for it to happen */ - for(;;) { - __asm("cli"); - __asm("hlt"); - } + local_irq_disable(); + for(;;) + halt(); } /* copied from process.c */ @@ -272,10 +271,9 @@ machine_restart(char *cmd) outb(basebd | 0x08, VOYAGER_MC_SETUP); outb(0x02, catbase + 0x21); } - for(;;) { - asm("cli"); - asm("hlt"); - } + local_irq_disable(); + for(;;) + halt(); } void diff -puN arch/i386/mach-voyager/voyager_smp.c~x86-more-asm-cleanups arch/i386/mach-voyager/voyager_smp.c --- devel/arch/i386/mach-voyager/voyager_smp.c~x86-more-asm-cleanups 2005-08-03 23:06:19.000000000 -0700 +++ devel-akpm/arch/i386/mach-voyager/voyager_smp.c 2005-08-03 23:06:19.000000000 -0700 @@ -1015,7 +1015,7 @@ smp_stop_cpu_function(void *dummy) cpu_clear(smp_processor_id(), cpu_online_map); local_irq_disable(); for(;;) - __asm__("hlt"); + halt(); } static DEFINE_SPINLOCK(call_lock); diff -puN include/asm-i386/msr.h~x86-more-asm-cleanups include/asm-i386/msr.h --- devel/include/asm-i386/msr.h~x86-more-asm-cleanups 2005-08-03 23:06:19.000000000 -0700 +++ devel-akpm/include/asm-i386/msr.h 2005-08-03 23:06:19.000000000 -0700 @@ -47,6 +47,21 @@ static inline void wrmsrl (unsigned long : "c" (msr), "0" (a), "d" (b), "i" (-EFAULT));\ ret__; }) +/* rdmsr with exception handling */ +#define rdmsr_safe(msr,a,b) ({ int ret__; \ + asm volatile("2: rdmsr ; xorl %0,%0\n" \ + "1:\n\t" \ + ".section .fixup,\"ax\"\n\t" \ + "3: movl %4,%0 ; jmp 1b\n\t" \ + ".previous\n\t" \ + ".section __ex_table,\"a\"\n" \ + " .align 4\n\t" \ + " .long 2b,3b\n\t" \ + ".previous" \ + : "=r" (ret__), "=a" (*(a)), "=d" (*(b)) \ + : "c" (msr), "i" (-EFAULT));\ + ret__; }) + #define rdtsc(low,high) \ __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high)) _