---

yaml --- r: 308077 b: refs/heads/master c: d9ed9fa h: refs/heads/master i: 308075: 06291be v: v3
git-mirror · May 25, 2012 · 45c6ca5 · 45c6ca5
1 parent 17ee249
commit 45c6ca5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc0c49f5db640b9dfc7bb801892b5cbb7508a76a
+refs/heads/master: d9ed9faac283a3be73f0e11a2ef49ee55aece4db
diff --git a/trunk/include/linux/hugetlb.h b/trunk/include/linux/hugetlb.h
@@ -284,6 +284,14 @@ static inline unsigned int blocks_per_huge_page(struct hstate *h)
 
 #include <asm/hugetlb.h>
 
+#ifndef arch_make_huge_pte
+static inline pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma,
+				       struct page *page, int writable)
+{
+	return entry;
+}
+#endif
+
 static inline struct hstate *page_hstate(struct page *page)
 {
 	return size_to_hstate(PAGE_SIZE << compound_order(page));

diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
@@ -2213,6 +2213,7 @@ static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page,
 	}
 	entry = pte_mkyoung(entry);
 	entry = pte_mkhuge(entry);
+	entry = arch_make_huge_pte(entry, vma, page, writable);
 
 	return entry;
 }