diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-15 02:21:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-15 02:21:30 -0500 |
| commit | 6a54aebf6978e9f296a4d3da3e40af425163c22e (patch) | |
| tree | 8217c7114db02d8b69c22fc44880749426949bc3 /arch/powerpc/mm/hugetlbpage.c | |
| parent | 067491b7313c41f49607fce782d29344d1472587 (diff) | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
Merge commit 'v3.2-rc5' into sched/core
Merge reason: Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/mm/hugetlbpage.c')
| -rw-r--r-- | arch/powerpc/mm/hugetlbpage.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 5964371303ac..8558b572e55d 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/of_fdt.h> | 15 | #include <linux/of_fdt.h> |
| 16 | #include <linux/memblock.h> | 16 | #include <linux/memblock.h> |
| 17 | #include <linux/bootmem.h> | 17 | #include <linux/bootmem.h> |
| 18 | #include <linux/moduleparam.h> | ||
| 18 | #include <asm/pgtable.h> | 19 | #include <asm/pgtable.h> |
| 19 | #include <asm/pgalloc.h> | 20 | #include <asm/pgalloc.h> |
| 20 | #include <asm/tlb.h> | 21 | #include <asm/tlb.h> |