From: jbeulich@novell.com
Subject: fix placement of some routines/data
Patch-mainline: obsolete

---
 arch/x86/kernel/e820_32-xen.c |    2 +-
 arch/x86/mm/ioremap-xen.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- a/arch/x86/kernel/e820_32-xen.c
+++ b/arch/x86/kernel/e820_32-xen.c
@@ -17,7 +17,7 @@
 #include <asm/setup.h>
 #include <xen/interface/memory.h>
 
-struct e820map e820;
+struct e820map __initdata e820;
 struct change_member {
 	struct e820entry *pbios; /* pointer to original bios entry */
 	unsigned long long addr; /* address for this change point */
--- a/arch/x86/mm/ioremap-xen.c
+++ b/arch/x86/mm/ioremap-xen.c
@@ -190,7 +190,7 @@
 EXPORT_SYMBOL(touch_pte_range);
 
 #ifdef CONFIG_X86_32
-int page_is_ram(unsigned long pagenr)
+int __init page_is_ram(unsigned long pagenr)
 {
 	unsigned long addr, end;
 	int i;