OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[uclinux-h8/linux.git]
/
arch
/
tile
/
mm
/
hugetlbpage.c
diff --git
a/arch/tile/mm/hugetlbpage.c
b/arch/tile/mm/hugetlbpage.c
index
c034dc3
..
e212c64
100644
(file)
--- a/
arch/tile/mm/hugetlbpage.c
+++ b/
arch/tile/mm/hugetlbpage.c
@@
-77,7
+77,7
@@
pte_t *huge_pte_alloc(struct mm_struct *mm,
else {
if (sz != PAGE_SIZE << huge_shift[HUGE_SHIFT_PAGE])
panic("Unexpected page size %#lx\n", sz);
- return pte_alloc_map(mm,
NULL,
pmd, addr);
+ return pte_alloc_map(mm, pmd, addr);
}
}
#else