From 181674ee4ab732fa5629e11ba8deddf30af6fa8d Mon Sep 17 00:00:00 2001 From: Nathan Fontenot Date: Mon, 13 Oct 2008 08:42:00 +0000 Subject: [PATCH] --- yaml --- r: 116934 b: refs/heads/master c: 04badfd2936333a23e0fc233f31a760d0dc9424f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/hotplug-memory.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 59050ec28c76..c1818209de79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c10c178a92b032ea3dd7259dcbbd1b9331c05c41 +refs/heads/master: 04badfd2936333a23e0fc233f31a760d0dc9424f diff --git a/trunk/arch/powerpc/platforms/pseries/hotplug-memory.c b/trunk/arch/powerpc/platforms/pseries/hotplug-memory.c index 140d02a5232a..a623ad256e9e 100644 --- a/trunk/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/trunk/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -22,6 +22,12 @@ static int pseries_remove_lmb(unsigned long base, unsigned int lmb_size) int ret; start_pfn = base >> PAGE_SHIFT; + + if (!pfn_valid(start_pfn)) { + lmb_remove(base, lmb_size); + return 0; + } + zone = page_zone(pfn_to_page(start_pfn)); /*