[kernel] r17263 - dists/sid/linux-2.6/debian/patches/bugfix/m68k

[Ben Hutchings]

Author: benh
Date: Thu Apr 28 02:35:37 2011
New Revision: 17263

Log:
Update an m68k patch to upstream version

Modified:
   dists/sid/linux-2.6/debian/patches/bugfix/m68k/0009-m68k-mm-set-all-online-nodes-in-N_NORMAL_MEMORY.patch

Modified: dists/sid/linux-2.6/debian/patches/bugfix/m68k/0009-m68k-mm-set-all-online-nodes-in-N_NORMAL_MEMORY.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/m68k/0009-m68k-mm-set-all-online-nodes-in-N_NORMAL_MEMORY.patch	Thu Apr 28 02:01:57 2011	(r17262)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/0009-m68k-mm-set-all-online-nodes-in-N_NORMAL_MEMORY.patch	Thu Apr 28 02:35:37 2011	(r17263)
@@ -1,47 +1,26 @@
-From 678cf05cb8031c762644a393b7c943e7a9d2c288 Mon Sep 17 00:00:00 2001
 From: Michael Schmitz <schmitzmic at googlemail.com>
-Date: Sun, 24 Apr 2011 13:59:43 +1200
-Subject: [PATCH 9/9] m68k, mm: set all online nodes in N_NORMAL_MEMORY
+Date: Tue, 26 Apr 2011 14:51:53 +1200
+Subject: [PATCH] m68k/mm: Set all online nodes in N_NORMAL_MEMORY
 
-David Rientjes wrote:
-> For m68k, N_NORMAL_MEMORY represents all nodes that have present memory
-> since it does not support HIGHMEM.  This patch sets the bit at the time
-> the node is brought online.
->
-> If N_NORMAL_MEMORY is not accurate, slub may encounter errors since it
-> uses this nodemask to setup per-cache kmem_cache_node data structures.
->
-> Signed-off-by: David Rientjes <rientjes at google.com>
-> ---
->  arch/m68k/mm/init_mm.c |    2 ++
->  1 files changed, 2 insertions(+), 0 deletions(-)
->
-> diff --git a/arch/m68k/mm/init_mm.c b/arch/m68k/mm/init_mm.c
-> --- a/arch/m68k/mm/init_mm.c
-> +++ b/arch/m68k/mm/init_mm.c
-> @@ -59,6 +59,8 @@ void __init m68k_setup_node(int node)
->  	}
->  #endif
->  	pg_data_map[node].bdata = bootmem_node_data + node;
-> +	if (node_present_pages(node))
-> +		node_set_state(node, N_NORMAL_MEMORY);
->  	node_set_online(node);
->  }
->
->
-As Andreas pointed out, node_present_pages is set in free_area_init_node
-which only gets called at the very end of m68k mm paging_init.
-
-The correct patch would be something like this - the need for the
-conditional is perhaps debatable, seeing as we set the pages present
-just before node_set_state.
-
-Tested on my ARAnyM test setup so far. I'd like to wait for an
-independent kernel image built by Thorsten before I test on the actual
-hardware. Sorry but you'll have to restart your build Thorsten :-)
+commit d4ac49cf229317af199ca32c488c7cbaf4053e22 upstream.
+
+For m68k, N_NORMAL_MEMORY represents all nodes that have present memory
+since it does not support HIGHMEM.  This patch sets the bit at the time
+node_present_pages has been set by free_area_init_node.
+At the time the node is brought online, the node state would have to be
+done unconditionally since information about present memory has not yet
+been recorded.
+
+If N_NORMAL_MEMORY is not accurate, slub may encounter errors since it
+uses this nodemask to setup per-cache kmem_cache_node data structures.
+
+This pach is an alternative to the one proposed by David Rientjes
+<rientjes at google.com> attempting to set node state immediately when
+bringing the node online.
 
 Signed-off-by: Michael Schmitz <schmitz at debian.org>
-Tested-by: Thorsten Glaser <tg at debian.org>
+Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
+CC: stable at kernel.org
 ---
  arch/m68k/mm/motorola.c |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
@@ -60,5 +39,5 @@
  }
  
 -- 
-1.7.4.4
+1.7.5