diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 09:57:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 09:57:02 +0100 |
| commit | 37ba317c9ed19eb126e40bbf563f2711e191a636 (patch) | |
| tree | c5865768f341fc0ab41899fe9af9dc5918784cee /arch/arm/mm/init.c | |
| parent | 708dc5125309cd33c5daaad3026cc4ae6ef39c8b (diff) | |
| parent | ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff) | |
Merge branches 'sched/cleanups' and 'linus' into sched/core
Diffstat (limited to 'arch/arm/mm/init.c')
| -rw-r--r-- | arch/arm/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 34df4d9d03a..80fd3b69ae1 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -382,7 +382,7 @@ void __init bootmem_init(void) for_each_node(node) bootmem_free_node(node, mi); - high_memory = __va(memend_pfn << PAGE_SHIFT); + high_memory = __va((memend_pfn << PAGE_SHIFT) - 1) + 1; /* * This doesn't seem to be used by the Linux memory manager any |