diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-13 11:03:16 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:30:11 +0100 |
| commit | 6e26380576d944d81967765616cba37271e0a113 (patch) | |
| tree | 504f968bcaa79b81daf9a898c7f4e1c27bfd6b52 /include | |
| parent | 7d088bbb85bde1c29e12fd1020cd50d513116c35 (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 0976fc46d1e0..40c876bb31b2 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -50,7 +50,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; |