diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-09-04 22:17:01 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-09-04 22:17:01 -0400 |
| commit | 7e80345652505165babf3f14bffe3c29089e0d51 (patch) | |
| tree | 134c6f17870feda8990392045ef3d7b34905b335 | |
| parent | b1624c72379b9b458d6fd8bd2a81997c57a8e04c (diff) | |
| download | 4.8-rt-patches-7e80345652505165babf3f14bffe3c29089e0d51.tar.gz | |
swap: patch refresh
| -rw-r--r-- | patches/mm-convert-swap-to-percpu-locked.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/patches/mm-convert-swap-to-percpu-locked.patch b/patches/mm-convert-swap-to-percpu-locked.patch index fe7f1f3a5209f..9162f7f55f8f6 100644 --- a/patches/mm-convert-swap-to-percpu-locked.patch +++ b/patches/mm-convert-swap-to-percpu-locked.patch @@ -1,4 +1,4 @@ -From 3512456d8b52b808ee72daf872880be483fd24de Mon Sep 17 00:00:00 2001 +From 0f884125071d0f90dbd6927194f28d8ce0865325 Mon Sep 17 00:00:00 2001 From: Ingo Molnar <mingo@elte.hu> Date: Fri, 3 Jul 2009 08:29:51 -0500 Subject: [PATCH] mm/swap: Convert to percpu locked @@ -22,10 +22,10 @@ index 98d34df40058..6df838de7d78 100644 extern void lru_cache_add_anon(struct page *page); extern void lru_cache_add_file(struct page *page); diff --git a/mm/compaction.c b/mm/compaction.c -index 79bfe0e06907..b6891c3b2e67 100644 +index 64df5fe052db..b04e2a713d55 100644 --- a/mm/compaction.c +++ b/mm/compaction.c -@@ -1534,10 +1534,12 @@ check_drain: +@@ -1585,10 +1585,12 @@ check_drain: block_start_pfn(cc->migrate_pfn, cc->order); if (cc->last_migrated_pfn < current_block_start) { @@ -41,10 +41,10 @@ index 79bfe0e06907..b6891c3b2e67 100644 cc->last_migrated_pfn = 0; } diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 9f96a3c6b02f..3d664afb3910 100644 +index 5e8e3b80f74a..9d439382bf73 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -6758,7 +6758,9 @@ static int page_alloc_cpu_notify(struct notifier_block *self, +@@ -6720,7 +6720,9 @@ static int page_alloc_cpu_notify(struct notifier_block *self, int cpu = (unsigned long)hcpu; if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) { @@ -55,7 +55,7 @@ index 9f96a3c6b02f..3d664afb3910 100644 /* diff --git a/mm/swap.c b/mm/swap.c -index 90530ff8ed16..3507afaf288d 100644 +index 616df4ddd870..2ace7834e795 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -32,6 +32,7 @@ @@ -90,9 +90,9 @@ index 90530ff8ed16..3507afaf288d 100644 } } -@@ -293,12 +297,13 @@ static bool need_activate_page_drain(int cpu) - void activate_page(struct page *page) +@@ -294,12 +298,13 @@ void activate_page(struct page *page) { + page = compound_head(page); if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) { - struct pagevec *pvec = &get_cpu_var(activate_page_pvecs); + struct pagevec *pvec = &get_locked_var(swapvec_lock, @@ -106,7 +106,7 @@ index 90530ff8ed16..3507afaf288d 100644 } } -@@ -324,7 +329,7 @@ void activate_page(struct page *page) +@@ -326,7 +331,7 @@ void activate_page(struct page *page) static void __lru_cache_activate_page(struct page *page) { @@ -115,7 +115,7 @@ index 90530ff8ed16..3507afaf288d 100644 int i; /* -@@ -346,7 +351,7 @@ static void __lru_cache_activate_page(struct page *page) +@@ -348,7 +353,7 @@ static void __lru_cache_activate_page(struct page *page) } } @@ -124,7 +124,7 @@ index 90530ff8ed16..3507afaf288d 100644 } /* -@@ -388,12 +393,12 @@ EXPORT_SYMBOL(mark_page_accessed); +@@ -390,12 +395,12 @@ EXPORT_SYMBOL(mark_page_accessed); static void __lru_cache_add(struct page *page) { @@ -139,7 +139,7 @@ index 90530ff8ed16..3507afaf288d 100644 } /** -@@ -591,9 +596,9 @@ void lru_add_drain_cpu(int cpu) +@@ -593,9 +598,9 @@ void lru_add_drain_cpu(int cpu) unsigned long flags; /* No harm done if a racing interrupt already did this */ @@ -151,7 +151,7 @@ index 90530ff8ed16..3507afaf288d 100644 } pvec = &per_cpu(lru_deactivate_file_pvecs, cpu); -@@ -625,11 +630,12 @@ void deactivate_file_page(struct page *page) +@@ -627,11 +632,12 @@ void deactivate_file_page(struct page *page) return; if (likely(get_page_unless_zero(page))) { @@ -166,7 +166,7 @@ index 90530ff8ed16..3507afaf288d 100644 } } -@@ -644,19 +650,20 @@ void deactivate_file_page(struct page *page) +@@ -646,19 +652,20 @@ void deactivate_file_page(struct page *page) void deactivate_page(struct page *page) { if (PageLRU(page) && PageActive(page) && !PageUnevictable(page)) { |