From 45c6ca57ca9dbab98a4d77b07ca80f1de34179d0 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Sun, 1 Apr 2012 14:01:34 -0400
Subject: [PATCH] --- yaml --- r: 308077 b: refs/heads/master c:
 d9ed9faac283a3be73f0e11a2ef49ee55aece4db h: refs/heads/master i:   308075:
 06291bea13a7d675409d3ae6191949732726be28 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/hugetlb.h | 8 ++++++++
 trunk/mm/hugetlb.c            | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fa26d677fc73..1ffe145408a9 100644
--- 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
index 000837e126e6..d5d6bbe2259e 100644
--- 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
index ae8f708e3d75..4e28416c47fb 100644
--- 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;
 }