Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e0c4ae06495494a38843da8445e2b6e1f59b9253

Authored by Mike Frysinger
Committed by Ingo Molnar
1 parent e697789d64
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

include/asm-x86/byteorder.h
Diff comments   View file @ e0c4ae0
... ... @@ -30,13 +30,13 @@
30 30 } v;
31 31 v.u = val;
32 32 #ifdef CONFIG_X86_BSWAP
33   - asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1"
  33 + __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1"
34 34 : "=r" (v.s.a), "=r" (v.s.b)
35 35 : "0" (v.s.a), "1" (v.s.b));
36 36 #else
37 37 v.s.a = ___arch__swab32(v.s.a);
38 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 40 #endif
41 41 return v.u;
42 42 }