Commit 79565b84 authored by Anton Blanchard's avatar Anton Blanchard Committed by Linus Torvalds

[PATCH] ppc64: Reserve kernel memory in kernel instead of wrapper

Reserve the kernel memory (0 - klimit) in the kernel instead of the wrapper.
Remove an old comment that incorrectly referred to klimit.
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5f66c615
...@@ -1023,6 +1023,7 @@ void __init early_init_devtree(void *params) ...@@ -1023,6 +1023,7 @@ void __init early_init_devtree(void *params)
scan_flat_dt(early_init_dt_scan_memory, NULL); scan_flat_dt(early_init_dt_scan_memory, NULL);
lmb_analyze(); lmb_analyze();
systemcfg->physicalMemorySize = lmb_phys_mem_size(); systemcfg->physicalMemorySize = lmb_phys_mem_size();
lmb_reserve(0, __pa(klimit));
DBG("Phys. mem: %lx\n", systemcfg->physicalMemorySize); DBG("Phys. mem: %lx\n", systemcfg->physicalMemorySize);
......
...@@ -1605,11 +1605,6 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, unsigned long ...@@ -1605,11 +1605,6 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, unsigned long
prom_debug("klimit=0x%x\n", RELOC(klimit)); prom_debug("klimit=0x%x\n", RELOC(klimit));
prom_debug("offset=0x%x\n", offset); prom_debug("offset=0x%x\n", offset);
/*
* Reserve kernel in reserve map
*/
reserve_mem(0, __pa(RELOC(klimit)));
/* /*
* Check for an initrd * Check for an initrd
*/ */
......
...@@ -149,7 +149,7 @@ struct rtas_error_log { ...@@ -149,7 +149,7 @@ struct rtas_error_log {
unsigned long target:4; /* Target of failed operation */ unsigned long target:4; /* Target of failed operation */
unsigned long type:8; /* General event or error*/ unsigned long type:8; /* General event or error*/
unsigned long extended_log_length:32; /* length in bytes */ unsigned long extended_log_length:32; /* length in bytes */
unsigned char buffer[1]; /* allocated by klimit bump */ unsigned char buffer[1];
}; };
struct flash_block { struct flash_block {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment