[linux] 03/03: [rt] fix conflicts between v4.6.6 and v4.6.5-rt10

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

ukleinek pushed a commit to branch sid
in repository linux.

commit a9d7770fa3c5d074360279411cf9e9d3bf0922bc
Author: Uwe Kleine-König <ukleinek at debian.org>
Date:   Thu Aug 11 22:13:58 2016 +0200

    [rt] fix conflicts between v4.6.6 and v4.6.5-rt10
---
 debian/changelog                                            |  2 +-
 .../features/all/rt/mm-convert-swap-to-percpu-locked.patch  | 13 ++++++-------
 .../features/all/rt/mm-memcontrol-do_not_disable_irq.patch  |  6 +++++-
 ...-memcontrol-mem_cgroup_migrate-replace-another-loc.patch |  4 ++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58e661e..bb2e463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -312,7 +312,7 @@ linux (4.6.6-1) UNRELEASED; urgency=medium
   * Bump ABI to 2
 
   [ Uwe Kleine-König ]
-  * [rt] Update to 4.6.5-rt10
+  * [rt] Update to 4.6.5-rt10 and rebase to 4.6.6
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 30 Jul 2016 14:23:58 +0100
 
diff --git a/debian/patches/features/all/rt/mm-convert-swap-to-percpu-locked.patch b/debian/patches/features/all/rt/mm-convert-swap-to-percpu-locked.patch
index 7888bf4..e79c032 100644
--- a/debian/patches/features/all/rt/mm-convert-swap-to-percpu-locked.patch
+++ b/debian/patches/features/all/rt/mm-convert-swap-to-percpu-locked.patch
@@ -82,7 +82,7 @@ Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
 -		local_irq_save(flags);
 +		local_lock_irqsave(rotate_lock, flags);
  		pvec = this_cpu_ptr(&lru_rotate_pvecs);
- 		if (!pagevec_add(pvec, page))
+ 		if (!pagevec_add(pvec, page) || PageCompound(page))
  			pagevec_move_tail(pvec);
 -		local_irq_restore(flags);
 +		local_unlock_irqrestore(rotate_lock, flags);
@@ -98,7 +98,7 @@ Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
 +						       activate_page_pvecs);
  
  		get_page(page);
- 		if (!pagevec_add(pvec, page))
+ 		if (!pagevec_add(pvec, page) || PageCompound(page))
  			pagevec_lru_move_fn(pvec, __activate_page, NULL);
 -		put_cpu_var(activate_page_pvecs);
 +		put_locked_var(swapvec_lock, activate_page_pvecs);
@@ -123,7 +123,7 @@ Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
  }
  
  /*
-@@ -387,13 +392,13 @@ EXPORT_SYMBOL(mark_page_accessed);
+@@ -387,12 +392,12 @@ EXPORT_SYMBOL(mark_page_accessed);
  
  static void __lru_cache_add(struct page *page)
  {
@@ -131,9 +131,8 @@ Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
 +	struct pagevec *pvec = &get_locked_var(swapvec_lock, lru_add_pvec);
  
  	get_page(page);
- 	if (!pagevec_space(pvec))
+ 	if (!pagevec_add(pvec, page) || PageCompound(page))
  		__pagevec_lru_add(pvec);
- 	pagevec_add(pvec, page);
 -	put_cpu_var(lru_add_pvec);
 +	put_locked_var(swapvec_lock, lru_add_pvec);
  }
@@ -159,7 +158,7 @@ Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
 +		struct pagevec *pvec = &get_locked_var(swapvec_lock,
 +						       lru_deactivate_file_pvecs);
  
- 		if (!pagevec_add(pvec, page))
+ 		if (!pagevec_add(pvec, page) || PageCompound(page))
  			pagevec_lru_move_fn(pvec, lru_deactivate_file_fn, NULL);
 -		put_cpu_var(lru_deactivate_file_pvecs);
 +		put_locked_var(swapvec_lock, lru_deactivate_file_pvecs);
@@ -175,7 +174,7 @@ Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
 +						       lru_deactivate_pvecs);
  
  		get_page(page);
- 		if (!pagevec_add(pvec, page))
+ 		if (!pagevec_add(pvec, page) || PageCompound(page))
  			pagevec_lru_move_fn(pvec, lru_deactivate_fn, NULL);
 -		put_cpu_var(lru_deactivate_pvecs);
 +		put_locked_var(swapvec_lock, lru_deactivate_pvecs);
diff --git a/debian/patches/features/all/rt/mm-memcontrol-do_not_disable_irq.patch b/debian/patches/features/all/rt/mm-memcontrol-do_not_disable_irq.patch
index f3c5bb4..cb5817a 100644
--- a/debian/patches/features/all/rt/mm-memcontrol-do_not_disable_irq.patch
+++ b/debian/patches/features/all/rt/mm-memcontrol-do_not_disable_irq.patch
@@ -83,7 +83,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
  
  	VM_BUG_ON_PAGE(PageLRU(page), page);
  	VM_BUG_ON_PAGE(page_count(page), page);
-@@ -5750,9 +5754,13 @@ void mem_cgroup_swapout(struct page *pag
+@@ -5750,12 +5754,17 @@ void mem_cgroup_swapout(struct page *pag
  	 * important here to have the interrupts disabled because it is the
  	 * only synchronisation we have for udpating the per-CPU variables.
  	 */
@@ -93,6 +93,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
 +#endif
  	mem_cgroup_charge_statistics(memcg, page, false, -1);
  	memcg_check_events(memcg, page);
+ 
+ 	if (!mem_cgroup_is_root(memcg))
+ 		css_put(&memcg->css);
++
 +	local_unlock_irqrestore(event_lock, flags);
  }
  
diff --git a/debian/patches/features/all/rt/mm-memcontrol-mem_cgroup_migrate-replace-another-loc.patch b/debian/patches/features/all/rt/mm-memcontrol-mem_cgroup_migrate-replace-another-loc.patch
index f03225b..8c0d623 100644
--- a/debian/patches/features/all/rt/mm-memcontrol-mem_cgroup_migrate-replace-another-loc.patch
+++ b/debian/patches/features/all/rt/mm-memcontrol-mem_cgroup_migrate-replace-another-loc.patch
@@ -19,11 +19,11 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
  
  	commit_charge(newpage, memcg, false);
  
--	local_irq_disable();
+-	local_irq_save(flags);
 +	local_lock_irq(event_lock);
  	mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages);
  	memcg_check_events(memcg, newpage);
--	local_irq_enable();
+-	local_irq_restore(flags);
 +	local_unlock_irq(event_lock);
  }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git