diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-01-29 11:56:45 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-01-29 11:56:45 +0900 |
| commit | e4e3c3f17fdb78282e3d9b4af7ec90d6e65798eb (patch) | |
| tree | b7018503c1b343e46b9a406855e64ec13bd62d6a /arch/sh/kernel/setup.c | |
| parent | ae5e6d05a606e05e054f816bd01e02f69d38d283 (diff) | |
| parent | c20f326a62c046ee958c3aa584f183201adb229f (diff) | |
| download | talos-op-linux-e4e3c3f17fdb78282e3d9b4af7ec90d6e65798eb.tar.gz talos-op-linux-e4e3c3f17fdb78282e3d9b4af7ec90d6e65798eb.zip | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh/kernel/setup.c')
| -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); |
