diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/mm/hugetlbpage.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/mips/mm/hugetlbpage.c')
| -rw-r--r-- | arch/mips/mm/hugetlbpage.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/mm/hugetlbpage.c b/arch/mips/mm/hugetlbpage.c index 8c2834f5919d..a7fee0dfb7a9 100644 --- a/arch/mips/mm/hugetlbpage.c +++ b/arch/mips/mm/hugetlbpage.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 17 | #include <linux/hugetlb.h> | 17 | #include <linux/hugetlb.h> |
| 18 | #include <linux/pagemap.h> | 18 | #include <linux/pagemap.h> |
| 19 | #include <linux/slab.h> | ||
| 20 | #include <linux/err.h> | 19 | #include <linux/err.h> |
| 21 | #include <linux/sysctl.h> | 20 | #include <linux/sysctl.h> |
| 22 | #include <asm/mman.h> | 21 | #include <asm/mman.h> |
| @@ -97,4 +96,3 @@ follow_huge_pmd(struct mm_struct *mm, unsigned long address, | |||
| 97 | page += ((address & ~HPAGE_MASK) >> PAGE_SHIFT); | 96 | page += ((address & ~HPAGE_MASK) >> PAGE_SHIFT); |
| 98 | return page; | 97 | return page; |
| 99 | } | 98 | } |
| 100 | |||