diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-01-01 13:12:15 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-01 13:12:15 -0500 |
commit | e0c4ae06495494a38843da8445e2b6e1f59b9253 (patch) | |
tree | 4a449bfd835c36dda68fdf3e2ba211a971d2d800 /include | |
parent | e697789d64f8748cb219d7f5c413c512953802cc (diff) |
x86: fix asm-x86/byteorder.h for userspace export
Since asm-x86/byteorder.h is exported to userspace, use __asm__ rather than
asm in its code.
Signed-Off-By: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/byteorder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/byteorder.h b/include/asm-x86/byteorder.h index 1f2d6d5bf20d..fe2f2e5d51ba 100644 --- a/include/asm-x86/byteorder.h +++ b/include/asm-x86/byteorder.h | |||
@@ -30,13 +30,13 @@ static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 val) | |||
30 | } v; | 30 | } v; |
31 | v.u = val; | 31 | v.u = val; |
32 | #ifdef CONFIG_X86_BSWAP | 32 | #ifdef CONFIG_X86_BSWAP |
33 | asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" | 33 | __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" |
34 | : "=r" (v.s.a), "=r" (v.s.b) | 34 | : "=r" (v.s.a), "=r" (v.s.b) |
35 | : "0" (v.s.a), "1" (v.s.b)); | 35 | : "0" (v.s.a), "1" (v.s.b)); |
36 | #else | 36 | #else |
37 | v.s.a = ___arch__swab32(v.s.a); | 37 | v.s.a = ___arch__swab32(v.s.a); |
38 | v.s.b = ___arch__swab32(v.s.b); | 38 | v.s.b = ___arch__swab32(v.s.b); |
39 | asm("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b)); | 39 | __asm__("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b)); |
40 | #endif | 40 | #endif |
41 | return v.u; | 41 | return v.u; |
42 | } | 42 | } |