From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 11 May 2009 07:33:06 +0000 (+0200)
Subject: Merge commit 'v2.6.30-rc5' into x86/mm
X-Git-Tag: v2.6.31-rc1~414^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=134cbf35c739bf89c51fd975a33a6b87507482c4;p=thirdparty%2Fkernel%2Flinux.git

Merge commit 'v2.6.30-rc5' into x86/mm

Merge reason: this branch was on a .30-rc2 base - sync it up with
              all the latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

134cbf35c739bf89c51fd975a33a6b87507482c4
diff --cc arch/x86/mm/init.c
index 4d67c33a2e165,ae4f7b5d71040..95f5ecf2be502
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@@ -7,11 -7,9 +7,12 @@@
  #include <asm/page.h>
  #include <asm/page_types.h>
  #include <asm/sections.h>
+ #include <asm/setup.h>
  #include <asm/system.h>
  #include <asm/tlbflush.h>
 +#include <asm/tlb.h>
 +
 +DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
  
  unsigned long __initdata e820_table_start;
  unsigned long __meminitdata e820_table_end;