diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-13 09:03:16 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:19:48 (GMT) |
| commit | 5336abf3662d36182be51af3582757130cf8bea3 (patch) | |
| tree | 6436fa83d995f227731863831b5a1986c5eebf2d /include/linux | |
| parent | e2cf20e0e398dde23f3f9624cf04d03dceeeefeb (diff) | |
| download | linux-fsl-qoriq-5336abf3662d36182be51af3582757130cf8bea3.tar.xz | |
jump-label-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
| -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 a507907..006627b 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -49,7 +49,8 @@ #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 static_key { atomic_t enabled; |