From: Charlie Paul <cpaul.windri...@gmail.com> This patch fixes the compile error for PREEMPT_DISABLE_OFFSET. The merge from standard/base into standard/axxia/base occurred see SHA:e5f304eceda575ca149f04402c76a8ff6ba07b8a the definition of PREEMPT_DISABLE_OFFSET was lost and caused the compile to fail. Also the PREEMPT_CHECK_OFFSET was removed and softirq.c would not compile. Replaced it with PREEMPT_LOCK_OFFSET.
Signed-off-by: Charlie Paul <cpaul.windri...@gmail.com> --- include/linux/preempt_mask.h | 6 +++--- kernel/softirq.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/preempt_mask.h b/include/linux/preempt_mask.h index 1f7d6a2..6a216ad 100644 --- a/include/linux/preempt_mask.h +++ b/include/linux/preempt_mask.h @@ -83,10 +83,10 @@ extern int in_serving_softirq(void); /* * The preempt_count offset after preempt_disable(); */ -#if defined(CONFIG_PREEMPT_COUNT) && !defined(CONFIG_PREEMPT_RT_FULL) -#define PREEMPT_LOCK_OFFSET PREEMPT_OFFSET +#if defined(CONFIG_PREEMPT_COUNT) +# define PREEMPT_DISABLE_OFFSET PREEMPT_OFFSET #else -#define PREEMPT_LOCK_OFFSET 0 +# define PREEMPT_DISABLE_OFFSET 0 #endif /* diff --git a/kernel/softirq.c b/kernel/softirq.c index fe4c0b9..7cd6451 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -566,7 +566,7 @@ EXPORT_SYMBOL(local_bh_disable); void __local_bh_disable_ip(unsigned long ip, unsigned int cnt) { __local_bh_disable(); - if (cnt & PREEMPT_CHECK_OFFSET) + if (cnt & PREEMPT_LOCK_OFFSET) preempt_disable(); } @@ -593,7 +593,7 @@ EXPORT_SYMBOL(local_bh_enable); extern void __local_bh_enable_ip(unsigned long ip, unsigned int cnt) { __local_bh_enable(); - if (cnt & PREEMPT_CHECK_OFFSET) + if (cnt & PREEMPT_LOCK_OFFSET) preempt_enable(); } -- 2.7.4 -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto