summaryrefslogtreecommitdiffstats
path: root/patches/mm-convert-swap-to-percpu-locked.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/mm-convert-swap-to-percpu-locked.patch')
-rw-r--r--patches/mm-convert-swap-to-percpu-locked.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/mm-convert-swap-to-percpu-locked.patch b/patches/mm-convert-swap-to-percpu-locked.patch
index 899ded4eb95f79..980ef9c9fa9f34 100644
--- a/patches/mm-convert-swap-to-percpu-locked.patch
+++ b/patches/mm-convert-swap-to-percpu-locked.patch
@@ -17,7 +17,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
-@@ -290,6 +290,7 @@ extern unsigned long nr_free_pagecache_p
+@@ -293,6 +293,7 @@ extern unsigned long nr_free_pagecache_p
/* linux/mm/swap.c */
@@ -27,7 +27,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
extern void lru_cache_add_file(struct page *page);
--- a/mm/compaction.c
+++ b/mm/compaction.c
-@@ -1585,10 +1585,12 @@ static enum compact_result compact_zone(
+@@ -1612,10 +1612,12 @@ static enum compact_result compact_zone(
block_start_pfn(cc->migrate_pfn, cc->order);
if (cc->last_migrated_pfn < current_block_start) {
@@ -44,7 +44,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
}
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -6600,7 +6600,9 @@ static int page_alloc_cpu_notify(struct
+@@ -6559,7 +6559,9 @@ static int page_alloc_cpu_notify(struct
int cpu = (unsigned long)hcpu;
if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) {