diff options
author | Alex Shi <alex.shi@linaro.org> | 2014-02-27 09:12:39 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2014-02-27 09:12:39 +0800 |
commit | 0a92210a812d913cfb99cb959ec75f27473af664 (patch) | |
tree | 76c3acbdae4c61e0828701f36445eb287314a721 /include | |
parent | 04eec8da27b98e3f8c370661a6b1e81c63950134 (diff) | |
parent | 61dde96f97bb5b1ed4c11caf9a857d55ad8f6e17 (diff) |
Merge tag 'v3.10.32' into linux-linaro-lsk
This is the 3.10.32 stable release
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/compiler-gcc4.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index ded429966c1..2507fd2a1eb 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h @@ -75,11 +75,7 @@ * * (asm goto is automatically volatile - the naming reflects this.) */ -#if GCC_VERSION <= 40801 -# define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -#else -# define asm_volatile_goto(x...) do { asm goto(x); } while (0) -#endif +#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP #if GCC_VERSION >= 40400 |