From 78ff09ce066fa74fba72e70c9c54411daab79658 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Tue, 26 Sep 2006 10:52:33 +0200
Subject: [PATCH] --- yaml --- r: 35855 b: refs/heads/master c:
 3bd4d18cbab622c504f131f3c0029c3aa29c05be h: refs/heads/master i:   35853:
 4c484061f720fc31af4ae98fabcc4b7f45300a7d   35851:
 6ac845d631e93c9d9fc80466e7d3c3c13ed140d8   35847:
 31d7ca93f9b455294494ef53871991d3f3f9a866   35839:
 cc4705e82321182264dfd8639d14018807456dff v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86_64/kernel/e820.c  | 2 ++
 trunk/arch/x86_64/kernel/setup.c | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6e6d94a1294d..b554036df8a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c31fbb1ad890b11f037c16496e53f28877c12722
+refs/heads/master: 3bd4d18cbab622c504f131f3c0029c3aa29c05be
diff --git a/trunk/arch/x86_64/kernel/e820.c b/trunk/arch/x86_64/kernel/e820.c
index a4739dc82937..164d0b83dc92 100644
--- a/trunk/arch/x86_64/kernel/e820.c
+++ b/trunk/arch/x86_64/kernel/e820.c
@@ -24,6 +24,8 @@
 #include <asm/bootsetup.h>
 #include <asm/sections.h>
 
+struct e820map e820 __initdata;
+
 /* 
  * PFN of last memory page.
  */
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index b85528597aa8..4be29832e3dc 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -97,7 +97,6 @@ struct sys_desc_table_struct {
 
 struct edid_info edid_info;
 EXPORT_SYMBOL_GPL(edid_info);
-struct e820map e820;
 
 extern int root_mountflags;