diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-13 11:03:16 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-11 11:07:50 -0500 |
| commit | 101e7211e321e04f10bfb1fc78afe6face68ad8d (patch) | |
| tree | 77441422019bb8fe22b1d7511887530e9160e58e /include | |
| parent | fa13b7cb41bbc8e68d4e6d89862d0d79343e5a3b (diff) | |
jump-label-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
| -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; |