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 #include +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;