path: root/include/linux
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-14 11:09:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-14 11:09:11 -0800
commit161aa772f972ec75b292f25d65816a6f1cd285cf (patch)
treecc05205d0c646b14c561a6f77a6386647d541d41 /include/linux
parenteef445eedcd80aa4f3646cecf285cf934d264eb6 (diff)
parent4640c7ee9b8953237d05a61ea3ea93981d1bc961 (diff)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin: "A collection of small fixes: - There still seem to be problems with asm goto which requires the empty asm hack. - If SMAP is disabled at compile time, don't enable it nor try to interpret a page fault as an SMAP violation. - Fix a case of unbounded recursion while tracing" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, smap: smap_violation() is bogus if CONFIG_X86_SMAP is off x86, smap: Don't enable SMAP if CONFIG_X86_SMAP is disabled compiler/gcc4: Make quirk for asm_volatile_goto() unconditional x86: Use preempt_disable_notrace() in cycles_2_ns()
Diffstat (limited to 'include/linux')
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index ded429966c1f..2507fd2a1eb4 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)
-# define asm_volatile_goto(x...) do { asm goto(x); } while (0)
+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
#if GCC_VERSION >= 40400

Privacy Policy