summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-13 09:03:16 (GMT)
committerScott Wood <scottwood@freescale.com>2015-02-13 22:20:56 (GMT)
commit90d6a6f3be5d4189869329969ec763f01bfb9427 (patch)
tree320615f46f4a46f8329b99df276d7a70d7668ff8 /include/linux
parent1476cd88309b6ab7c345eb59d23e65822674bda1 (diff)
downloadlinux-fsl-qoriq-90d6a6f3be5d4189869329969ec763f01bfb9427.tar.xz
jump-label-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/jump_label.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 9216e46..c5f7962 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -49,7 +49,8 @@
#include <linux/types.h>
#include <linux/compiler.h>
-#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL)
+#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL) && \
+ !defined(CONFIG_PREEMPT_BASE)
struct static_key {
atomic_t enabled;