diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /arch/ppc/mm | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'arch/ppc/mm')
| -rw-r--r-- | arch/ppc/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c index 216527e34..25d728fdd 100644 --- a/arch/ppc/mm/init.c +++ b/arch/ppc/mm/init.c @@ -1107,7 +1107,7 @@ unsigned long __init find_available_memory(void) */ void __init paging_init(void) { - unsigned int zones_size[MAX_NR_ZONES], i; + unsigned long zones_size[MAX_NR_ZONES], i; /* * Grab some memory for bad_page and bad_pagetable to use. @@ -1197,7 +1197,7 @@ unsigned long __init *pmac_find_end_of_memory(void) unsigned long a, total; /* max amount of RAM we allow -- Cort */ -#define RAM_LIMIT (64<<20) +#define RAM_LIMIT (768<<20) memory_node = find_devices("memory"); if (memory_node == NULL) { |