git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
sparc
/
mm
/
hugetlbpage.c
diff --git
a/arch/sparc/mm/hugetlbpage.c
b/arch/sparc/mm/hugetlbpage.c
index
5fdddf1
..
f4e9764
100644
(file)
--- a/
arch/sparc/mm/hugetlbpage.c
+++ b/
arch/sparc/mm/hugetlbpage.c
@@
-214,7
+214,7
@@
pte_t *huge_pte_alloc(struct mm_struct *mm,
if (pud) {
pmd = pmd_alloc(mm, pud, addr);
if (pmd)
- pte = pte_alloc_map(mm, pmd, addr);
+ pte = pte_alloc_map(mm,
NULL,
pmd, addr);
}
return pte;
}