From 3168ab8d229f7b0cebbd448246d84a11f2413c53 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Tue, 28 Apr 2009 16:00:50 +0300
Subject: [PATCH] --- yaml --- r: 145770 b: refs/heads/master c:
 9518e0e4350a5ea8ca200ce320b28d6284a7b0ce h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/init.c    | 3 +++
 trunk/arch/x86/mm/init_32.c | 1 -
 trunk/arch/x86/mm/init_64.c | 2 --
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c7324bbce83b..bf7b19bfcee1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b72394e4089643f11669d9610907a1442fe044a
+refs/heads/master: 9518e0e4350a5ea8ca200ce320b28d6284a7b0ce
diff --git a/trunk/arch/x86/mm/init.c b/trunk/arch/x86/mm/init.c
index fedde5359a04..4d67c33a2e16 100644
--- a/trunk/arch/x86/mm/init.c
+++ b/trunk/arch/x86/mm/init.c
@@ -9,6 +9,9 @@
 #include <asm/sections.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;
diff --git a/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c
index a640a7f04905..fef1d90d4f15 100644
--- a/trunk/arch/x86/mm/init_32.c
+++ b/trunk/arch/x86/mm/init_32.c
@@ -52,7 +52,6 @@
 #include <asm/page_types.h>
 #include <asm/init.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 unsigned long highstart_pfn, highend_pfn;
 
 static noinline int do_test_wp_bit(void);
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index 1016ea015932..6a1a573e20f9 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/arch/x86/mm/init_64.c
@@ -52,8 +52,6 @@
 
 static unsigned long dma_reserve __initdata;
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 static int __init parse_direct_gbpages_off(char *arg)
 {
 	direct_gbpages = 0;