aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/mm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/parisc/mm')
-rw-r--r--arch/parisc/mm/init.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 8a3b71a26fde..75ea9f2a8a41 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -78,12 +78,11 @@ static void __init mem_limit_func(void)
78{ 78{
79 char *cp, *end; 79 char *cp, *end;
80 unsigned long limit; 80 unsigned long limit;
81 extern char saved_command_line[];
82 81
83 /* We need this before __setup() functions are called */ 82 /* We need this before __setup() functions are called */
84 83
85 limit = MAX_MEM; 84 limit = MAX_MEM;
86 for (cp = saved_command_line; *cp; ) { 85 for (cp = boot_command_line; *cp; ) {
87 if (memcmp(cp, "mem=", 4) == 0) { 86 if (memcmp(cp, "mem=", 4) == 0) {
88 cp += 4; 87 cp += 4;
89 limit = memparse(cp, &end); 88 limit = memparse(cp, &end);
@@ -868,9 +867,7 @@ void __init paging_init(void)
868 for (i = 0; i < npmem_ranges; i++) { 867 for (i = 0; i < npmem_ranges; i++) {
869 unsigned long zones_size[MAX_NR_ZONES] = { 0, }; 868 unsigned long zones_size[MAX_NR_ZONES] = { 0, };
870 869
871 /* We have an IOMMU, so all memory can go into a single 870 zones_size[ZONE_NORMAL] = pmem_ranges[i].pages;
872 ZONE_DMA zone. */
873 zones_size[ZONE_DMA] = pmem_ranges[i].pages;
874 871
875#ifdef CONFIG_DISCONTIGMEM 872#ifdef CONFIG_DISCONTIGMEM
876 /* Need to initialize the pfnnid_map before we can initialize 873 /* Need to initialize the pfnnid_map before we can initialize