From 28d63a4fd3fe3d2d4212e2f7031e57b460596c4d Mon Sep 17 00:00:00 2001 From: Nathan Fontenot Date: Wed, 1 Oct 2008 09:44:02 +0000 Subject: [PATCH] --- yaml --- r: 114598 b: refs/heads/master c: 9fd3f88cb67ac51bd5face8441472b91e042be67 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b620a047cfaf..79c2a7263dbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c12d906f4ef690c65e60111375856640f63a545 +refs/heads/master: 9fd3f88cb67ac51bd5face8441472b91e042be67 diff --git a/trunk/arch/powerpc/platforms/pseries/hotplug-memory.c b/trunk/arch/powerpc/platforms/pseries/hotplug-memory.c index a1a368dd2d99..140d02a5232a 100644 --- a/trunk/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/trunk/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -21,7 +21,7 @@ static int pseries_remove_lmb(unsigned long base, unsigned int lmb_size) struct zone *zone; int ret; - start_pfn = base >> PFN_SECTION_SHIFT; + start_pfn = base >> PAGE_SHIFT; zone = page_zone(pfn_to_page(start_pfn)); /*