From be4c10298ce4da26f108cf06b18918db591567ec Mon Sep 17 00:00:00 2001 From: Christopher SMITH Date: Mon, 6 Oct 2008 12:46:18 +0100 Subject: [PATCH] --- yaml --- r: 130999 b: refs/heads/master c: 48865163109690ed988e2d98d6f258ec743c94c7 h: refs/heads/master i: 130997: cc6f0f28def29eca1ce41fad4deb12c1bbf31e64 130995: 1f3b94cff4c53922ca3aec935dafd562be90c870 130991: 69cbf67b8e7f3f67e3c8da6a33bf471f1c33443f v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/setup.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b741b75d27b4..3742c3648af6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cadc4e1a2b4d20d0cc0e81f2c6ba0588775e54e5 +refs/heads/master: 48865163109690ed988e2d98d6f258ec743c94c7 diff --git a/trunk/arch/sh/kernel/setup.c b/trunk/arch/sh/kernel/setup.c index 534247508572..370d2cfa34eb 100644 --- a/trunk/arch/sh/kernel/setup.c +++ b/trunk/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);