---

yaml --- r: 116934 b: refs/heads/master c: 04badfd h: refs/heads/master v: v3
git-mirror · Oct 21, 2008 · 181674e · 181674e
1 parent 20f667c
commit 181674e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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));
 
 	/*