[Patch:008/011] Configureable NODES_SHIFT (for arm)

[Yasunori Goto]

This is form arm.

Signed-off-by: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>

 include/asm-arm/numnodes.h            |   26 --------------------------
 arch/arm/Kconfig                      |    6 ++++++
 include/asm-arm/arch-lh7a40x/memory.h |    2 --
 3 files changed, 6 insertions(+), 28 deletions(-)

Index: pxm_ver4/arch/arm/Kconfig
===================================================================
--- pxm_ver4.orig/arch/arm/Kconfig	2006-03-29 20:12:40.436504739 +0900
+++ pxm_ver4/arch/arm/Kconfig	2006-03-29 20:35:07.255824178 +0900
@@ -496,6 +496,12 @@ config ARCH_DISCONTIGMEM_ENABLE
 	  or have huge holes in the physical address space for other reasons.
 	  See <file:Documentation/vm/numa> for more.
 
+config NODES_SHIFT
+	int
+	default "4" if ARCH_LH7A40X
+	default "2"
+	depends on NEED_MULTIPLE_NODES
+
 source "mm/Kconfig"
 
 config LEDS
Index: pxm_ver4/include/asm-arm/arch-lh7a40x/memory.h
===================================================================
--- pxm_ver4.orig/include/asm-arm/arch-lh7a40x/memory.h	2006-03-29 20:12:40.436504739 +0900
+++ pxm_ver4/include/asm-arm/arch-lh7a40x/memory.h	2006-03-29 20:34:39.445277644 +0900
@@ -31,8 +31,6 @@
 
 #ifdef CONFIG_DISCONTIGMEM
 
-#define NODES_SHIFT	4	/* Up to 16 nodes */
-
 /*
  * Given a kernel address, find the home node of the underlying memory.
  */
Index: pxm_ver4/include/asm-arm/numnodes.h
===================================================================
--- pxm_ver4.orig/include/asm-arm/numnodes.h	2006-03-29 20:12:40.436504739 +0900
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/*
- *  linux/include/asm-arm/numnodes.h
- *
- *  Copyright (C) 2002 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-/* This declaration for the size of the NUMA (CONFIG_DISCONTIGMEM)
- * memory node table is the default.
- *
- * A good place to override this value is include/asm/arch/memory.h.
- */
-
-#ifndef __ASM_ARM_NUMNODES_H
-#define __ASM_ARM_NUMNODES_H
-
-#include <asm/memory.h>
-
-#ifndef NODES_SHIFT
-# define NODES_SHIFT	2	/* Normally, Max 4 Nodes */
-#endif
-
-#endif

-- 
Yasunori Goto 


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/