summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-13 11:03:16 +0200
committerClark Williams <williams@redhat.com>2012-03-06 10:17:59 -0600
commitdf846fb67f97892282a8cf76d2138c1ea00c3557 (patch)
tree061ec8ab7f62c7a104c5954ab90a464cc82f2f94
parentfe20ba6f5a18d896f8d96ada01d404127e36527b (diff)
jump-label-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--include/linux/jump_label.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 388b0d425b50..9cc8ed96888f 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -4,7 +4,7 @@
#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 jump_label_key {
atomic_t enabled;