From 7622a9c9ff9b4ccc6f30f5374e7a5a5712e15e1b Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Thu, 24 Jan 2013 12:20:05 -0800
Subject: [PATCH] --- yaml --- r: 356249 b: refs/heads/master c:
 0e691cf824f76adefb4498fe39c300aba2c2575a h: refs/heads/master i:   356247:
 59752bf03526a5ab4e3d825f7bb3fc5b6f456cfe v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/x86/include/asm/page.h        |  4 ++++
 trunk/arch/x86/kernel/machine_kexec_64.c | 13 +++++++++----
 trunk/arch/x86/mm/init.c                 |  4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e5b4f270147e..fc640cbe48df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ebdc79f7a177d3098b89ba8ef2dd2b235163685
+refs/heads/master: 0e691cf824f76adefb4498fe39c300aba2c2575a
diff --git a/trunk/arch/x86/include/asm/page.h b/trunk/arch/x86/include/asm/page.h
index 8ca82839288a..100a20c7b98d 100644
--- a/trunk/arch/x86/include/asm/page.h
+++ b/trunk/arch/x86/include/asm/page.h
@@ -17,6 +17,10 @@
 
 struct page;
 
+#include <linux/range.h>
+extern struct range pfn_mapped[];
+extern int nr_pfn_mapped;
+
 static inline void clear_user_page(void *page, unsigned long vaddr,
 				   struct page *pg)
 {
diff --git a/trunk/arch/x86/kernel/machine_kexec_64.c b/trunk/arch/x86/kernel/machine_kexec_64.c
index d2d7e023a8c8..4eabc160696f 100644
--- a/trunk/arch/x86/kernel/machine_kexec_64.c
+++ b/trunk/arch/x86/kernel/machine_kexec_64.c
@@ -100,10 +100,15 @@ static int init_pgtable(struct kimage *image, unsigned long start_pgtable)
 
 	level4p = (pgd_t *)__va(start_pgtable);
 	clear_page(level4p);
-	result = kernel_ident_mapping_init(&info, level4p,
-						0, max_pfn << PAGE_SHIFT);
-	if (result)
-		return result;
+	for (i = 0; i < nr_pfn_mapped; i++) {
+		mstart = pfn_mapped[i].start << PAGE_SHIFT;
+		mend   = pfn_mapped[i].end << PAGE_SHIFT;
+
+		result = kernel_ident_mapping_init(&info,
+						 level4p, mstart, mend);
+		if (result)
+			return result;
+	}
 
 	/*
 	 * segments's mem ranges could be outside 0 ~ max_pfn,
diff --git a/trunk/arch/x86/mm/init.c b/trunk/arch/x86/mm/init.c
index 3364a7643a4c..d41815265a0b 100644
--- a/trunk/arch/x86/mm/init.c
+++ b/trunk/arch/x86/mm/init.c
@@ -302,8 +302,8 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range,
 	return nr_range;
 }
 
-static struct range pfn_mapped[E820_X_MAX];
-static int nr_pfn_mapped;
+struct range pfn_mapped[E820_X_MAX];
+int nr_pfn_mapped;
 
 static void add_pfn_range_mapped(unsigned long start_pfn, unsigned long end_pfn)
 {