]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.9-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Jan 2018 09:58:03 +0000 (10:58 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Jan 2018 09:58:03 +0000 (10:58 +0100)
added patches:
mm-vmstat-make-nr_tlb_remote_flush_received-available-even-on-up.patch

queue-4.9/mm-vmstat-make-nr_tlb_remote_flush_received-available-even-on-up.patch [new file with mode: 0644]
queue-4.9/series

diff --git a/queue-4.9/mm-vmstat-make-nr_tlb_remote_flush_received-available-even-on-up.patch b/queue-4.9/mm-vmstat-make-nr_tlb_remote_flush_received-available-even-on-up.patch
new file mode 100644 (file)
index 0000000..df764bb
--- /dev/null
@@ -0,0 +1,39 @@
+From 5dd0b16cdaff9b94da06074d5888b03235c0bf17 Mon Sep 17 00:00:00 2001
+From: Andy Lutomirski <luto@kernel.org>
+Date: Mon, 5 Jun 2017 07:40:25 -0700
+Subject: mm/vmstat: Make NR_TLB_REMOTE_FLUSH_RECEIVED available even on UP
+
+From: Andy Lutomirski <luto@kernel.org>
+
+commit 5dd0b16cdaff9b94da06074d5888b03235c0bf17 upstream.
+
+This fixes CONFIG_SMP=n, CONFIG_DEBUG_TLBFLUSH=y without introducing
+further #ifdef soup.  Caught by a Kbuild bot randconfig build.
+
+Signed-off-by: Andy Lutomirski <luto@kernel.org>
+Cc: Borislav Petkov <bp@alien8.de>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Fixes: ce4a4e565f52 ("x86/mm: Remove the UP asm/tlbflush.h code, always use the (formerly) SMP code")
+Link: http://lkml.kernel.org/r/76da9a3cc4415996f2ad2c905b93414add322021.1496673616.git.luto@kernel.org
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/vm_event_item.h |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/include/linux/vm_event_item.h
++++ b/include/linux/vm_event_item.h
+@@ -89,10 +89,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PS
+ #endif
+ #endif
+ #ifdef CONFIG_DEBUG_TLBFLUSH
+-#ifdef CONFIG_SMP
+               NR_TLB_REMOTE_FLUSH,    /* cpu tried to flush others' tlbs */
+               NR_TLB_REMOTE_FLUSH_RECEIVED,/* cpu received ipi for flush */
+-#endif /* CONFIG_SMP */
+               NR_TLB_LOCAL_FLUSH_ALL,
+               NR_TLB_LOCAL_FLUSH_ONE,
+ #endif /* CONFIG_DEBUG_TLBFLUSH */
index 7e7e1c3888291599737145d823332c8ad2bcd6e3..e744575c72cd1ec1daa202d0887541f08ba6b45c 100644 (file)
@@ -73,3 +73,4 @@ nohz-prevent-a-timer-interrupt-storm-in-tick_nohz_stop_sched_tick.patch
 x86-smpboot-remove-stale-tlb-flush-invocations.patch
 n_tty-fix-extproc-vs-icanon-interaction-with-tiocinq-aka-fionread.patch
 tty-fix-tty_ldisc_receive_buf-documentation.patch
+mm-vmstat-make-nr_tlb_remote_flush_received-available-even-on-up.patch