diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 18:35:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 18:35:30 -0500 |
| commit | ec2f9d1331f658433411c58077871e1eef4ee1b4 (patch) | |
| tree | 6d0e5f6665e5c89ee392379967a52e6fcae17cf2 /arch/sparc64/mm/init.c | |
| parent | 89697f1d715e20fff0361cca79efd5a371623af7 (diff) | |
| parent | 34cc560e6a72ff414ff7d107426a411b0a093ad3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Re-export saved_command_line to modules.
[SPARC64]: Increase command line size to 2048 like other arches.
[SPARC64]: We do not need ZONE_DMA.
Diffstat (limited to 'arch/sparc64/mm/init.c')
| -rw-r--r-- | arch/sparc64/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 09d434f41e4b..b1a1ee0cc6bd 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
| @@ -1467,8 +1467,8 @@ void __init paging_init(void) | |||
| 1467 | for (znum = 0; znum < MAX_NR_ZONES; znum++) | 1467 | for (znum = 0; znum < MAX_NR_ZONES; znum++) |
| 1468 | zones_size[znum] = zholes_size[znum] = 0; | 1468 | zones_size[znum] = zholes_size[znum] = 0; |
| 1469 | 1469 | ||
| 1470 | zones_size[ZONE_DMA] = end_pfn; | 1470 | zones_size[ZONE_NORMAL] = end_pfn; |
| 1471 | zholes_size[ZONE_DMA] = end_pfn - pages_avail; | 1471 | zholes_size[ZONE_NORMAL] = end_pfn - pages_avail; |
| 1472 | 1472 | ||
| 1473 | free_area_init_node(0, &contig_page_data, zones_size, | 1473 | free_area_init_node(0, &contig_page_data, zones_size, |
| 1474 | __pa(PAGE_OFFSET) >> PAGE_SHIFT, | 1474 | __pa(PAGE_OFFSET) >> PAGE_SHIFT, |