From c8d59500928f34a94b58ca29f3c641cb3aca5bee Mon Sep 17 00:00:00 2001 From: John David Anglin Date: Sat, 2 Feb 2013 23:42:25 +0000 Subject: [PATCH] --- yaml --- r: 356313 b: refs/heads/master c: 872420b3b869d47b1f1dd93418c34e306d962668 h: refs/heads/master i: 356311: 086e05da98b777ef356ce1ce54066847118d49fa v: v3 --- [refs] | 2 +- trunk/arch/parisc/include/asm/mmzone.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1516c2fff963..0af8d501759c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ca8b91df88fa417aa7aac19494a8ae1602db2cb +refs/heads/master: 872420b3b869d47b1f1dd93418c34e306d962668 diff --git a/trunk/arch/parisc/include/asm/mmzone.h b/trunk/arch/parisc/include/asm/mmzone.h index e67eb9c3d1bf..31835b998a5a 100644 --- a/trunk/arch/parisc/include/asm/mmzone.h +++ b/trunk/arch/parisc/include/asm/mmzone.h @@ -1,9 +1,10 @@ #ifndef _PARISC_MMZONE_H #define _PARISC_MMZONE_H +#define MAX_PHYSMEM_RANGES 8 /* Fix the size for now (current known max is 3) */ + #ifdef CONFIG_DISCONTIGMEM -#define MAX_PHYSMEM_RANGES 8 /* Fix the size for now (current known max is 3) */ extern int npmem_ranges; struct node_map_data { @@ -60,7 +61,5 @@ static inline int pfn_valid(int pfn) return 0; } -#else /* !CONFIG_DISCONTIGMEM */ -#define MAX_PHYSMEM_RANGES 1 #endif #endif /* _PARISC_MMZONE_H */