diff for duplicates of <20150715095204.12246.98268.stgit@buzz> diff --git a/a/1.txt b/N1/1.txt index 2205fe3..4aacdc4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,7 +32,7 @@ index dca71714f860..b12f81022a6b 100644 +static __always_inline bool should_resched(int preempt_offset) { - return unlikely(!raw_cpu_read_4(__preempt_count)); -+ return unlikely(raw_cpu_read_4(__preempt_count) = preempt_offset); ++ return unlikely(raw_cpu_read_4(__preempt_count) == preempt_offset); } #ifdef CONFIG_PREEMPT @@ -48,7 +48,7 @@ index d0a7a4753db2..0bec580a4885 100644 +static __always_inline bool should_resched(int preempt_offset) { - return unlikely(!preempt_count() && tif_need_resched()); -+ return unlikely(preempt_count() = preempt_offset && ++ return unlikely(preempt_count() == preempt_offset && + tif_need_resched()); } diff --git a/a/content_digest b/N1/content_digest index 034447f..1383aff 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020150715095201.12246.49283.stgit@buzz\0" "From\0Konstantin Khlebnikov <khlebnikov@yandex-team.ru>\0" "Subject\0[PATCH v2 3/3] sched/preempt: fix cond_resched_lock() and cond_resched_softirq()\0" - "Date\0Wed, 15 Jul 2015 09:52:04 +0000\0" + "Date\0Wed, 15 Jul 2015 12:52:04 +0300\0" "To\0Peter Zijlstra <peterz@infradead.org>\0" "Cc\0linux-arch@vger.kernel.org" x86@kernel.org @@ -49,7 +49,7 @@ "+static __always_inline bool should_resched(int preempt_offset)\n" " {\n" "-\treturn unlikely(!raw_cpu_read_4(__preempt_count));\n" - "+\treturn unlikely(raw_cpu_read_4(__preempt_count) = preempt_offset);\n" + "+\treturn unlikely(raw_cpu_read_4(__preempt_count) == preempt_offset);\n" " }\n" " \n" " #ifdef CONFIG_PREEMPT\n" @@ -65,7 +65,7 @@ "+static __always_inline bool should_resched(int preempt_offset)\n" " {\n" "-\treturn unlikely(!preempt_count() && tif_need_resched());\n" - "+\treturn unlikely(preempt_count() = preempt_offset &&\n" + "+\treturn unlikely(preempt_count() == preempt_offset &&\n" "+\t\t\ttif_need_resched());\n" " }\n" " \n" @@ -175,4 +175,4 @@ " \t\tpreempt_schedule_common();\n" " \t\tlocal_bh_disable();" -3bbd0195c669b3145f1662212d59bd90d991fc899a4c3eb989167bb2bfbcfa93 +f970e6fad4e0dd418c6363f86a240ae56f1941b2b7d391d4c58960876e83a27a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.