From 257083ac58a46fda8f8f80e26ce9040edd2c2694 Mon Sep 17 00:00:00 2001
From: Tang Chen <tangchen@cn.fujitsu.com>
Date: Fri, 22 Feb 2013 16:33:06 -0800
Subject: [PATCH] --- yaml --- r: 356519 b: refs/heads/master c:
 bbcab8789d4a5b942773aa7496794ceebe2d3f78 h: refs/heads/master i:   356517:
 e6b9709c731b5f5e3d69b6136b3f61f7ba0dd305   356515:
 e29fd0c062376568ce51e9a3708cf00e66e306e3   356511:
 85254c7cd879d4e13aadc64b85ee199e052d4748 v: v3

---
 [refs]                      |  2 +-
 trunk/arch/x86/mm/init_64.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index faa2436966b0..6d33b6a79d8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae9aae9eda2db71bf4b592f15618b0160eb07731
+refs/heads/master: bbcab8789d4a5b942773aa7496794ceebe2d3f78
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index ca6cd403a275..4e58b83e6b2e 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/arch/x86/mm/init_64.c
@@ -1011,6 +1011,15 @@ remove_pagetable(unsigned long start, unsigned long end, bool direct)
 	flush_tlb_all();
 }
 
+static void __meminit
+kernel_physical_mapping_remove(unsigned long start, unsigned long end)
+{
+	start = (unsigned long)__va(start);
+	end = (unsigned long)__va(end);
+
+	remove_pagetable(start, end, true);
+}
+
 #ifdef CONFIG_MEMORY_HOTREMOVE
 int __ref arch_remove_memory(u64 start, u64 size)
 {
@@ -1020,6 +1029,7 @@ int __ref arch_remove_memory(u64 start, u64 size)
 	int ret;
 
 	zone = page_zone(pfn_to_page(start_pfn));
+	kernel_physical_mapping_remove(start, start + size);
 	ret = __remove_pages(zone, start_pfn, nr_pages);
 	WARN_ON_ONCE(ret);