Re: [patch] m68k, mm: set all online nodes in N_NORMAL_MEMORY

[Thorsten Glaser <tg@mirbsd.de>]

Geert Uytterhoeven dixit:

>Fixed those up, applied, and will send to Linus for 2.6.39-final.

Attached patch
• synchronises the 0009-* patch against what will be in 2.6.39
  (no changes in the patch area, only in the patch metadata)
• adds the series/5 file which seemingly was forgotten

I think you’ll still need the following patch for 2.6.39:
0008-m68k-atari-Reserve-some-ST-RAM-early-on-for-device-b.patch
We’re working on getting that functionality in 2.6.40 though.

bye,
//mirabilos
-- 
I believe no one can invent an algorithm. One just happens to hit upon it
when God enlightens him. Or only God invents algorithms, we merely copy them.
If you don't believe in God, just consider God as Nature if you won't deny
existence.		-- Coywolf Qi Hunt

Index: 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	(revision 17261)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/0009-m68k-mm-set-all-online-nodes-in-N_NORMAL_MEMORY.patch	(working copy)
@@ -1,47 +1,25 @@
-From 678cf05cb8031c762644a393b7c943e7a9d2c288 Mon Sep 17 00:00:00 2001
+From fb5f44b4fd12bfd16019956d0d0795278a2f561b Mon Sep 17 00:00:00 2001
 From: Michael Schmitz <schmitzmic@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@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.
+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.
 
-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.
+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.
 
-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 :-)
+This pach is an alternative to the one proposed by David Rientjes
+<rientjes@google.com> attempting to set node state immediately when
+bringing the node online.
 
 Signed-off-by: Michael Schmitz <schmitz@debian.org>
-Tested-by: Thorsten Glaser <tg@debian.org>
+Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
+CC: stable@kernel.org
 ---
  arch/m68k/mm/motorola.c |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
@@ -60,5 +38,5 @@
  }
  
 -- 
-1.7.4.4
+1.7.5
 
Index: dists/sid/linux-2.6/debian/patches/series/5
===================================================================
--- dists/sid/linux-2.6/debian/patches/series/5	(revision 0)
+++ dists/sid/linux-2.6/debian/patches/series/5	(revision 0)
@@ -0,0 +1,12 @@
+# will be in 2.6.39 (pulled from linus tree)
++ bugfix/m68k/0001-m68k-Add-helper-function-handle_kernel_fault.patch
++ bugfix/m68k/0002-m68k-Use-base_trap_init-to-initialize-vectors.patch
++ bugfix/m68k/0003-m68k-Allow-all-kernel-traps-to-be-handled-via-except.patch
++ bugfix/m68k/0004-m68k-atari-Initial-ARAnyM-support.patch
++ bugfix/m68k/0005-m68k-atari-ARAnyM-Add-support-for-block-access.patch
++ bugfix/m68k/0006-m68k-atari-ARAnyM-Add-support-for-console-access.patch
++ bugfix/m68k/0007-m68k-atari-ARAnyM-Add-support-for-network-access.patch
+# accepted by m68k subsystem maintainer; probably in 2.6.40
++ bugfix/m68k/0008-m68k-atari-Reserve-some-ST-RAM-early-on-for-device-b.patch
+# will be in 2.6.39
++ bugfix/m68k/0009-m68k-mm-set-all-online-nodes-in-N_NORMAL_MEMORY.patch