From 5217f24b2f97141bec85d0c04ad2ec4c3a8b5aff Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Thu, 26 Aug 2010 16:16:28 -0700
Subject: [PATCH] --- yaml --- r: 217839 b: refs/heads/master c:
 f0991802bb4368e33848e7f823caa487d23555fb h: refs/heads/master i:   217837:
 97700fa0c4df7fc6d9d20297f63a153e694a60c1   217835:
 f6446a451caa5e0c4744bbec4dd8c1216b775773   217831:
 610c591f84ccd4a390f19781a9c3866eb7fd045c   217823:
 c0f0bc16a04459166bc27daefa5ca5dbfd012249 v: v3

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

diff --git a/[refs] b/[refs]
index 837e84092433..5bb5e40546cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2e875298729540300a9a0324ee66e3b7883a912
+refs/heads/master: f0991802bb4368e33848e7f823caa487d23555fb
diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c
index 151813d97552..71c6af6c89a5 100644
--- a/trunk/arch/x86/xen/mmu.c
+++ b/trunk/arch/x86/xen/mmu.c
@@ -1843,13 +1843,15 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
 	return pgd;
 }
 #else	/* !CONFIG_X86_64 */
-static pmd_t level2_kernel_pgt[PTRS_PER_PMD] __page_aligned_bss;
+static RESERVE_BRK_ARRAY(pmd_t, level2_kernel_pgt, PTRS_PER_PMD);
 
 __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
 					 unsigned long max_pfn)
 {
 	pmd_t *kernel_pmd;
 
+	level2_kernel_pgt = extend_brk(sizeof(pmd_t *) * PTRS_PER_PMD, PAGE_SIZE);
+
 	max_pfn_mapped = PFN_DOWN(__pa(xen_start_info->pt_base) +
 				  xen_start_info->nr_pt_frames * PAGE_SIZE +
 				  512*1024);