x86 fixes
Linus, please pull the latest x86 git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
two fixes for v2.6.24, for exported headers bugs. (no effect on the kernel side)
Ingo
------------------>
Mike Frysinger (2):
x86: fix asm-x86/byteorder.h for userspace export
x86: fix asm-x86/msr.h for user-space export
byteorder.h | 4 +-- msr.h | 74 +++++++++++++++++++++++++++++++----------------------------- 2 files changed, 41 insertions(+), 37 deletions(-)
include/asm-x86/byteorder.h +2 -2
@@ -30,13 +30,13 @@ static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 val) } v; v.u = val;#ifdef CONFIG_X86_BSWAP - asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" + __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" :"=r" (v.s.a),"=r" (v.s.b) :"0" (v.s.a),"1" (v.s.b));#else v.s.a =___arch__swab32 (v.s.a); v.s.b =___arch__swab32 (v.s.b); - asm("xchgl %0,%1" :"=r" (v.s.a),"=r" (v.s.b) :"0" (v.s.a),"1" (v.s.b)); + __asm__("xchgl %0,%1" :"=r" (v.s.a),"=r" (v.s.b) :"0" (v.s.a),"1" (v.s.b));#endif return v.u; }
include/asm-x86/msr.h +39 -35
112 lines not on this page · raw message