[PATCH 9/10] make fixups wordsize agnostic

This patch uses the _ASM_ALIGN and _ASM_PTR macros
to make the fixups in native_read/write_msr_safe look the same
for x86_64 and i386. Besides using this macros, we also have to
take the explicit instruction suffixes out. It's okay
because all this instructions uses registers, and can be sized by
them.

Signed-off-by: Glauber de Oliveira Costa <[email protected]>
---
 include/asm-x86/msr.h |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h
index 9c695c7..f3a01ca 100644
--- a/include/asm-x86/msr.h
+++ b/include/asm-x86/msr.h
@@ -29,6 +29,7 @@ static inline unsigned long long native_read_tscp(int *aux)
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
+#include <asm/asm.h>
 #include <asm/errno.h>
 
 static inline unsigned long long native_read_msr(unsigned int msr)
@@ -44,14 +45,14 @@ static inline unsigned long long native_read_msr_safe(unsigned int msr,
 {
 	unsigned long long val;
 
-	asm volatile("2: rdmsr ; xorl %0,%0\n"
+	asm volatile("2: rdmsr ; xor %0,%0\n"
 		     "1:\n\t"
 		     ".section .fixup,\"ax\"\n\t"
-		     "3:  movl %3,%0 ; jmp 1b\n\t"
+		     "3:  mov %3,%0 ; jmp 1b\n\t"
 		     ".previous\n\t"
 		     ".section __ex_table,\"a\"\n"
-		     "   .align 4\n\t"
-		     "   .long	2b,3b\n\t"
+		     _ASM_ALIGN "\n\t"
+		     _ASM_PTR " 2b,3b\n\t"
 		     ".previous"
 		     : "=r" (*err), "=A" (val)
 		     : "c" (msr), "i" (-EFAULT));
@@ -69,14 +70,14 @@ static inline int native_write_msr_safe(unsigned int msr,
 					unsigned low, unsigned high)
 {
 	int err;
-	asm volatile("2: wrmsr ; xorl %0,%0\n"
+	asm volatile("2: wrmsr ; xor %0,%0\n"
 		     "1:\n\t"
 		     ".section .fixup,\"ax\"\n\t"
-		     "3:  movl %4,%0 ; jmp 1b\n\t"
+		     "3:  mov %4,%0 ; jmp 1b\n\t"
 		     ".previous\n\t"
 		     ".section __ex_table,\"a\"\n"
-		     "   .align 4\n\t"
-		     "   .long	2b,3b\n\t"
+		     _ASM_ALIGN "\n\t"
+		     _ASM_PTR " 2b,3b\n\t"
 		     ".previous"
 		     : "=a" (err)
 		     : "c" (msr), "0" (low), "d" (high),
-- 
1.4.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH 10/10] integrate i386 and x86_64 code in msr.h
    • From: Glauber de Oliveira Costa <[email protected]>

• References:
  • [PATCH 0/10] Integrate msr.h
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 1/10] Wipe out traditional opt from x86_64 Makefile
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 2/10] unify msr smp funcs
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 3/10] allow sched clock to be overridden by paravirt
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 4/10] split get_cycles_sync
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 5/10] unify cpuid functions
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 6/10] introduce native_read_tscp
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 7/10] change rdpmc interface
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 8/10] change write msr functions interface
    • From: Glauber de Oliveira Costa <[email protected]>

• Prev by Date: [PATCH 8/10] change write msr functions interface
• Next by Date: [PATCH 10/10] integrate i386 and x86_64 code in msr.h
• Previous by thread: [PATCH 8/10] change write msr functions interface
• Next by thread: [PATCH 10/10] integrate i386 and x86_64 code in msr.h
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]