git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfs-for-4.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
mm
/
hugetlbpage.c
diff --git
a/arch/ia64/mm/hugetlbpage.c
b/arch/ia64/mm/hugetlbpage.c
index f50d4b3f501ad6a5cd0fcf10dfd66b82500b0e54..85de86d36fdf2a71783697212e2e5cdb1e2dbc46 100644
(file)
--- a/
arch/ia64/mm/hugetlbpage.c
+++ b/
arch/ia64/mm/hugetlbpage.c
@@
-38,7
+38,7
@@
huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz)
if (pud) {
pmd = pmd_alloc(mm, pud, taddr);
if (pmd)
- pte = pte_alloc_map(mm,
NULL,
pmd, taddr);
+ pte = pte_alloc_map(mm, pmd, taddr);
}
return pte;
}