diff options
author | Christopher SMITH <chris.smith@st.com> | 2008-10-06 13:46:18 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-01-29 03:56:02 +0100 |
commit | 48865163109690ed988e2d98d6f258ec743c94c7 (patch) | |
tree | 6ccdfa1786764a815dbc5a80f5da76f7e9c41e19 /arch/sh | |
parent | sh: Handle calling csum_partial with misaligned data (diff) | |
download | linux-48865163109690ed988e2d98d6f258ec743c94c7.tar.xz linux-48865163109690ed988e2d98d6f258ec743c94c7.zip |
sh: Only reserve memory under CONFIG_ZERO_PAGE_OFFSET when it != 0.
Signed-off-by: Chris Smith <chris.smith@st.com>
Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 534247508572..370d2cfa34eb 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -262,11 +262,11 @@ void __init setup_bootmem_allocator(unsigned long free_pfn) BOOTMEM_DEFAULT); /* - * reserve physical page 0 - it's a special BIOS page on many boxes, - * enabling clean reboots, SMP operation, laptop functions. + * Reserve physical pages below CONFIG_ZERO_PAGE_OFFSET. */ - reserve_bootmem(__MEMORY_START, CONFIG_ZERO_PAGE_OFFSET, - BOOTMEM_DEFAULT); + if (CONFIG_ZERO_PAGE_OFFSET != 0) + reserve_bootmem(__MEMORY_START, CONFIG_ZERO_PAGE_OFFSET, + BOOTMEM_DEFAULT); sparse_memory_present_with_active_regions(0); |