blob: 4a0db19dddfc21fa214766c7f7c171625812afb0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
From a4ec42cedfd36b00d76d4328c959daafd6f95653 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 13 Jul 2011 11:03:16 +0200
Subject: [PATCH 209/270] jump-label-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
include/linux/jump_label.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index c513a40..f47f3e0 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -51,7 +51,8 @@
#include <linux/compiler.h>
#include <linux/workqueue.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;
--
1.7.10.4
|
