From dbe9770241821acf2c3f1961b32df766ded1169d Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sat, 4 Oct 2003 21:02:25 -0700 Subject: [PATCH] [PATCH] Clean up MAX_NR_NODES/NUMNODES/etc. [3/5] From: Matthew Dobson Fix up the sh arch. sh defined NR_NODES, change sh to use standard MAX_NUMNODES instead. --- arch/sh/mm/init.c | 4 ++-- include/asm-sh/mmzone.h | 10 +++++----- include/asm-sh/numnodes.h | 7 +++++++ 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 include/asm-sh/numnodes.h diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index 5c72add7f9d00..09261f48c6240 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -51,8 +51,8 @@ unsigned long mmu_context_cache = NO_CONTEXT; #endif #ifdef CONFIG_DISCONTIGMEM -pg_data_t discontig_page_data[NR_NODES]; -bootmem_data_t discontig_node_bdata[NR_NODES]; +pg_data_t discontig_page_data[MAX_NUMNODES]; +bootmem_data_t discontig_node_bdata[MAX_NUMNODES]; #endif void show_mem(void) diff --git a/include/asm-sh/mmzone.h b/include/asm-sh/mmzone.h index fa323fc66f243..0e7406601fdf8 100644 --- a/include/asm-sh/mmzone.h +++ b/include/asm-sh/mmzone.h @@ -10,14 +10,14 @@ #include +#ifdef CONFIG_DISCONTIGMEM + /* Currently, just for HP690 */ #define PHYSADDR_TO_NID(phys) ((((phys) - __MEMORY_START) >= 0x01000000)?1:0) -#define NR_NODES 2 -extern pg_data_t discontig_page_data[NR_NODES]; -extern bootmem_data_t discontig_node_bdata[NR_NODES]; +extern pg_data_t discontig_page_data[MAX_NUMNODES]; +extern bootmem_data_t discontig_node_bdata[MAX_NUMNODES]; -#ifdef CONFIG_DISCONTIGMEM /* * Following are macros that each numa implmentation must define. */ @@ -46,7 +46,7 @@ static inline int is_valid_page(struct page *page) { unsigned int i; - for (i = 0; i < NR_NODES; i++) { + for (i = 0; i < MAX_NUMNODES; i++) { if (page >= NODE_MEM_MAP(i) && page < NODE_MEM_MAP(i) + NODE_DATA(i)->node_size) return 1; diff --git a/include/asm-sh/numnodes.h b/include/asm-sh/numnodes.h new file mode 100644 index 0000000000000..f73e85b72ecbd --- /dev/null +++ b/include/asm-sh/numnodes.h @@ -0,0 +1,7 @@ +#ifndef _ASM_MAX_NUMNODES_H +#define _ASM_MAX_NUMNODES_H + +/* Max 2 Nodes */ +#define NODES_SHIFT 1 + +#endif /* _ASM_MAX_NUMNODES_H */ -- 2.53.0