From 0926bb1e2d8f0c28cd9310d577244ed686451366 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Sat, 21 Nov 2009 11:32:49 +0000
Subject: [PATCH] --- yaml --- r: 174422 b: refs/heads/master c:
 fa24ba62ea2869308ffc9f0b286ac9650b4ca6cb h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/xen/mmu.c     | 2 +-
 trunk/arch/x86/xen/suspend.c | 2 ++
 trunk/arch/x86/xen/xen-ops.h | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 19a318fc1600..2cabb3fbe275 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3905bb2aa7bb801b31946b37a4635ebac4009051
+refs/heads/master: fa24ba62ea2869308ffc9f0b286ac9650b4ca6cb
diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c
index 3bf7b1d250ce..bf4cd6bfe959 100644
--- a/trunk/arch/x86/xen/mmu.c
+++ b/trunk/arch/x86/xen/mmu.c
@@ -185,7 +185,7 @@ static inline unsigned p2m_index(unsigned long pfn)
 }
 
 /* Build the parallel p2m_top_mfn structures */
-static void __init xen_build_mfn_list_list(void)
+void xen_build_mfn_list_list(void)
 {
 	unsigned pfn, idx;
 
diff --git a/trunk/arch/x86/xen/suspend.c b/trunk/arch/x86/xen/suspend.c
index 95be7b434724..6343a5d8e93c 100644
--- a/trunk/arch/x86/xen/suspend.c
+++ b/trunk/arch/x86/xen/suspend.c
@@ -27,6 +27,8 @@ void xen_pre_suspend(void)
 
 void xen_post_suspend(int suspend_cancelled)
 {
+	xen_build_mfn_list_list();
+
 	xen_setup_shared_info();
 
 	if (suspend_cancelled) {
diff --git a/trunk/arch/x86/xen/xen-ops.h b/trunk/arch/x86/xen/xen-ops.h
index 32529326683d..f9153a300bce 100644
--- a/trunk/arch/x86/xen/xen-ops.h
+++ b/trunk/arch/x86/xen/xen-ops.h
@@ -25,6 +25,7 @@ extern struct shared_info *HYPERVISOR_shared_info;
 
 void xen_setup_mfn_list_list(void);
 void xen_setup_shared_info(void);
+void xen_build_mfn_list_list(void);
 void xen_setup_machphys_mapping(void);
 pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn);
 void xen_ident_map_ISA(void);