projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2feceef
091bf76
)
Merge commit 'v2.6.30-rc5' into x86/mm
author
Ingo Molnar
<mingo@elte.hu>
Mon, 11 May 2009 07:33:06 +0000
(09:33 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 11 May 2009 07:33:15 +0000
(09:33 +0200)
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>
1
2
arch/x86/mm/init.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/x86/mm/init.c
index
4d67c33
,
ae4f7b5
..
95f5ecf
---
1
/
arch/x86/mm/init.c
---
2
/
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;