[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-9518e0e4350a5ea8ca200ce320b28d6284a7b0ce@git.kernel.org>
Date: Thu, 30 Apr 2009 08:18:42 GMT
From: tip-bot for Pekka Enberg <penberg@...helsinki.fi>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
penberg@...helsinki.fi, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:x86/mm] x86: move per-cpu mmu_gathers to mm/init.c
Commit-ID: 9518e0e4350a5ea8ca200ce320b28d6284a7b0ce
Gitweb: http://git.kernel.org/tip/9518e0e4350a5ea8ca200ce320b28d6284a7b0ce
Author: Pekka Enberg <penberg@...helsinki.fi>
AuthorDate: Tue, 28 Apr 2009 16:00:50 +0300
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Thu, 30 Apr 2009 10:12:37 +0200
x86: move per-cpu mmu_gathers to mm/init.c
[ Impact: cleanup ]
Signed-off-by: Pekka Enberg <penberg@...helsinki.fi>
LKML-Reference: <1240923650.1982.22.camel@...berg-laptop>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/mm/init.c | 3 +++
arch/x86/mm/init_32.c | 1 -
arch/x86/mm/init_64.c | 2 --
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index fedde53..4d67c33 100644
--- a/arch/x86/mm/init.c
+++ b/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/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index a640a7f..fef1d90 100644
--- a/arch/x86/mm/init_32.c
+++ b/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/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 1016ea0..6a1a573 100644
--- a/arch/x86/mm/init_64.c
+++ b/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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists