diff options
Diffstat (limited to 'arch/parisc/mm/init.c')
-rw-r--r-- | arch/parisc/mm/init.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 0667f2b4f977..12117db0043b 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
@@ -77,12 +77,11 @@ static void __init mem_limit_func(void) | |||
77 | { | 77 | { |
78 | char *cp, *end; | 78 | char *cp, *end; |
79 | unsigned long limit; | 79 | unsigned long limit; |
80 | extern char saved_command_line[]; | ||
81 | 80 | ||
82 | /* We need this before __setup() functions are called */ | 81 | /* We need this before __setup() functions are called */ |
83 | 82 | ||
84 | limit = MAX_MEM; | 83 | limit = MAX_MEM; |
85 | for (cp = saved_command_line; *cp; ) { | 84 | for (cp = boot_command_line; *cp; ) { |
86 | if (memcmp(cp, "mem=", 4) == 0) { | 85 | if (memcmp(cp, "mem=", 4) == 0) { |
87 | cp += 4; | 86 | cp += 4; |
88 | limit = memparse(cp, &end); | 87 | limit = memparse(cp, &end); |
@@ -808,9 +807,7 @@ void __init paging_init(void) | |||
808 | for (i = 0; i < npmem_ranges; i++) { | 807 | for (i = 0; i < npmem_ranges; i++) { |
809 | unsigned long zones_size[MAX_NR_ZONES] = { 0, }; | 808 | unsigned long zones_size[MAX_NR_ZONES] = { 0, }; |
810 | 809 | ||
811 | /* We have an IOMMU, so all memory can go into a single | 810 | zones_size[ZONE_NORMAL] = pmem_ranges[i].pages; |
812 | ZONE_DMA zone. */ | ||
813 | zones_size[ZONE_DMA] = pmem_ranges[i].pages; | ||
814 | 811 | ||
815 | #ifdef CONFIG_DISCONTIGMEM | 812 | #ifdef CONFIG_DISCONTIGMEM |
816 | /* Need to initialize the pfnnid_map before we can initialize | 813 | /* Need to initialize the pfnnid_map before we can initialize |