aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/include
diff options
context:
space:
mode:
authorJohn David Anglin <dave.anglin@bell.net>2013-02-02 18:42:25 -0500
committerHelge Deller <deller@gmx.de>2013-02-20 16:51:01 -0500
commit872420b3b869d47b1f1dd93418c34e306d962668 (patch)
tree44b68a4c3634e72abfd665f313db2da4a7681fc6 /arch/parisc/include
parent5ca8b91df88fa417aa7aac19494a8ae1602db2cb (diff)
parisc: always detect multiple physical ranges
This patch unbreaks the current logic in that way, that even if CONFIG_DISCONTIGMEM isn't set, the user may be informed, that he should turn on CONFIG_DISCONTIGMEM for his machine. Signed-off-by: John David Anglin <dave.anglin@bell.net> Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc/include')
-rw-r--r--arch/parisc/include/asm/mmzone.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/parisc/include/asm/mmzone.h b/arch/parisc/include/asm/mmzone.h
index e67eb9c3d1bf..31835b998a5a 100644
--- a/arch/parisc/include/asm/mmzone.h
+++ b/arch/parisc/include/asm/mmzone.h
@@ -1,9 +1,10 @@
1#ifndef _PARISC_MMZONE_H 1#ifndef _PARISC_MMZONE_H
2#define _PARISC_MMZONE_H 2#define _PARISC_MMZONE_H
3 3
4#define MAX_PHYSMEM_RANGES 8 /* Fix the size for now (current known max is 3) */
5
4#ifdef CONFIG_DISCONTIGMEM 6#ifdef CONFIG_DISCONTIGMEM
5 7
6#define MAX_PHYSMEM_RANGES 8 /* Fix the size for now (current known max is 3) */
7extern int npmem_ranges; 8extern int npmem_ranges;
8 9
9struct node_map_data { 10struct node_map_data {
@@ -60,7 +61,5 @@ static inline int pfn_valid(int pfn)
60 return 0; 61 return 0;
61} 62}
62 63
63#else /* !CONFIG_DISCONTIGMEM */
64#define MAX_PHYSMEM_RANGES 1
65#endif 64#endif
66#endif /* _PARISC_MMZONE_H */ 65#endif /* _PARISC_MMZONE_H */