git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
sh64
/
mm
/
hugetlbpage.c
diff --git
a/arch/sh64/mm/hugetlbpage.c
b/arch/sh64/mm/hugetlbpage.c
index
187cf01
..
4b455f6
100644
(file)
--- a/
arch/sh64/mm/hugetlbpage.c
+++ b/
arch/sh64/mm/hugetlbpage.c
@@
-53,6
+53,11
@@
pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
return pte;
}
+int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
+{
+ return 0;
+}
+
void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, pte_t entry)
{