diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-02 01:10:03 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-02 01:10:06 -0500 |
commit | 8104a4775ad8a7863af0b898224b15aa708582db (patch) | |
tree | 71380e4db36e9d91e521d0a98be74981e32a6700 /mm/pgtable-generic.c | |
parent | f6bbc1daac964da551130dbf01809d3fbd178b2d (diff) | |
parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) |
Merge commit 'v2.6.38-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/pgtable-generic.c')
-rw-r--r-- | mm/pgtable-generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c index 0369f5b3ba1b..eb663fb533e0 100644 --- a/mm/pgtable-generic.c +++ b/mm/pgtable-generic.c | |||
@@ -6,6 +6,7 @@ | |||
6 | * Copyright (C) 2010 Linus Torvalds | 6 | * Copyright (C) 2010 Linus Torvalds |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/pagemap.h> | ||
9 | #include <asm/tlb.h> | 10 | #include <asm/tlb.h> |
10 | #include <asm-generic/pgtable.h> | 11 | #include <asm-generic/pgtable.h> |
11 | 12 | ||