aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/mm/hugetlbpage.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2009-07-16 04:21:39 +0000
committerSteve French <sfrench@us.ibm.com>2009-07-16 04:21:39 +0000
commitf6c43385435640e056424034caac0d765c45e370 (patch)
tree54c2ba0a7d3abb156bc51f6b9f02e00f0a260f85 /arch/mips/mm/hugetlbpage.c
parent65bc98b0059360e458aebd208587be44641227c1 (diff)
parent35b5c55fee08e6e4001ba98060a2d0b82f70b5f4 (diff)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/mm/hugetlbpage.c')
-rw-r--r--arch/mips/mm/hugetlbpage.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/mm/hugetlbpage.c b/arch/mips/mm/hugetlbpage.c
index 471c09aa161..8c2834f5919 100644
--- a/arch/mips/mm/hugetlbpage.c
+++ b/arch/mips/mm/hugetlbpage.c
@@ -16,7 +16,6 @@
#include <linux/mm.h>
#include <linux/hugetlb.h>
#include <linux/pagemap.h>
-#include <linux/smp_lock.h>
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/sysctl.h>