diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-13 11:03:16 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-10 16:40:58 -0500 |
| commit | 6f8826d9285d395bf8b1f35075b6d0a4c420df33 (patch) | |
| tree | d07fab3e18c94a7971114d8c66f7d5bdce695b41 | |
| parent | 3d90dcd33c2fe04700415c64b14d64d75113aedc (diff) | |
jump-label-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/linux/jump_label.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index c513a40510f5..f47f3e0675a3 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; |