diff options
Diffstat (limited to 'recipes-kernel/linux/linux-toradex-rt-3.14.52/rename_define.patch')
| -rw-r--r-- | recipes-kernel/linux/linux-toradex-rt-3.14.52/rename_define.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-toradex-rt-3.14.52/rename_define.patch b/recipes-kernel/linux/linux-toradex-rt-3.14.52/rename_define.patch new file mode 100644 index 0000000..6f5b962 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-rt-3.14.52/rename_define.patch @@ -0,0 +1,59 @@ +From d379e64ca4fc535334a02dc0314cba6e50f4b720 Mon Sep 17 00:00:00 2001 +From: Frederic Weisbecker <fweisbec@gmail.com> +Date: Tue, 12 May 2015 16:41:48 +0200 +Subject: [PATCH] sched/preempt: Rename PREEMPT_CHECK_OFFSET to + PREEMPT_DISABLE_OFFSET + +commit 90b62b5129d5cb50f62f40e684de7a1961e57197 upstream. + +"CHECK" suggests it's only used as a comparison mask. But now it's used +further as a config-conditional preempt disabler offset. Lets +disambiguate this name. + +Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> +Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> +Cc: Linus Torvalds <torvalds@linux-foundation.org> +Cc: Peter Zijlstra <peterz@infradead.org> +Cc: Thomas Gleixner <tglx@linutronix.de> +Link: http://lkml.kernel.org/r/1431441711-29753-4-git-send-email-fweisbec@gmail.com +Signed-off-by: Ingo Molnar <mingo@kernel.org> +Signed-off-by: Mike Galbraith <efault@gmx.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + include/linux/preempt_mask.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/linux/preempt_mask.h b/include/linux/preempt_mask.h +index dbeec4d4a3bea..1f654ee836b7d 100644 +--- a/include/linux/preempt_mask.h ++++ b/include/linux/preempt_mask.h +@@ -72,9 +72,9 @@ + #define in_nmi() (preempt_count() & NMI_MASK) + + #if defined(CONFIG_PREEMPT_COUNT) +-# define PREEMPT_CHECK_OFFSET 1 ++# define PREEMPT_DISABLE_OFFSET 1 + #else +-# define PREEMPT_CHECK_OFFSET 0 ++# define PREEMPT_DISABLE_OFFSET 0 + #endif + + /* +@@ -90,7 +90,7 @@ + * + * Work as expected. + */ +-#define SOFTIRQ_LOCK_OFFSET (SOFTIRQ_DISABLE_OFFSET + PREEMPT_CHECK_OFFSET) ++#define SOFTIRQ_LOCK_OFFSET (SOFTIRQ_DISABLE_OFFSET + PREEMPT_DISABLE_OFFSET) + + /* + * Are we running in atomic context? WARNING: this macro cannot +@@ -106,7 +106,7 @@ + * (used by the scheduler, *after* releasing the kernel lock) + */ + #define in_atomic_preempt_off() \ +- ((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_CHECK_OFFSET) ++ ((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_DISABLE_OFFSET) + + #ifdef CONFIG_PREEMPT_COUNT + # define preemptible() (preempt_count() == 0 && !irqs_disabled()) |