From 281e4dc09dac860a3ece5488453d1cc413e5cbf0 Mon Sep 17 00:00:00 2001
From: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Date: Mon, 28 Apr 2008 02:13:28 -0700
Subject: [PATCH] --- yaml --- r: 94046 b: refs/heads/master c:
 8fe627ec5b7c47b1654dff50536d9709863295a3 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-ia64/hugetlb.h    | 5 +++++
 trunk/include/asm-powerpc/hugetlb.h | 5 +++++
 trunk/include/asm-sh/hugetlb.h      | 5 +++++
 trunk/include/asm-sparc64/hugetlb.h | 5 +++++
 trunk/include/asm-x86/hugetlb.h     | 5 +++++
 trunk/mm/hugetlb.c                  | 1 +
 7 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 83a501dc5a42..764a5852c899 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d779079bfd1196e077bb1d0a906c37ae770b102
+refs/heads/master: 8fe627ec5b7c47b1654dff50536d9709863295a3
diff --git a/trunk/include/asm-ia64/hugetlb.h b/trunk/include/asm-ia64/hugetlb.h
index f0ee14c6e172..5f5434374972 100644
--- a/trunk/include/asm-ia64/hugetlb.h
+++ b/trunk/include/asm-ia64/hugetlb.h
@@ -34,4 +34,9 @@ static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
 	return ptep_get_and_clear(mm, addr, ptep);
 }
 
+static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
+					 unsigned long addr, pte_t *ptep)
+{
+}
+
 #endif /* _ASM_IA64_HUGETLB_H */
diff --git a/trunk/include/asm-powerpc/hugetlb.h b/trunk/include/asm-powerpc/hugetlb.h
index f537993c5c87..bead2ff78493 100644
--- a/trunk/include/asm-powerpc/hugetlb.h
+++ b/trunk/include/asm-powerpc/hugetlb.h
@@ -34,4 +34,9 @@ static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm)
 {
 }
 
+static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
+					 unsigned long addr, pte_t *ptep)
+{
+}
+
 #endif /* _ASM_POWERPC_HUGETLB_H */
diff --git a/trunk/include/asm-sh/hugetlb.h b/trunk/include/asm-sh/hugetlb.h
index 885218d2c844..d1ed476467a1 100644
--- a/trunk/include/asm-sh/hugetlb.h
+++ b/trunk/include/asm-sh/hugetlb.h
@@ -46,4 +46,9 @@ static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
 	return ptep_get_and_clear(mm, addr, ptep);
 }
 
+static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
+					 unsigned long addr, pte_t *ptep)
+{
+}
+
 #endif /* _ASM_SH_HUGETLB_H */
diff --git a/trunk/include/asm-sparc64/hugetlb.h b/trunk/include/asm-sparc64/hugetlb.h
index 7e111cfd31ea..0b9e44c85c5d 100644
--- a/trunk/include/asm-sparc64/hugetlb.h
+++ b/trunk/include/asm-sparc64/hugetlb.h
@@ -39,4 +39,9 @@ static inline void hugetlb_free_pgd_range(struct mmu_gather **tlb,
 	free_pgd_range(tlb, addr, end, floor, ceiling);
 }
 
+static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
+					 unsigned long addr, pte_t *ptep)
+{
+}
+
 #endif /* _ASM_SPARC64_HUGETLB_H */
diff --git a/trunk/include/asm-x86/hugetlb.h b/trunk/include/asm-x86/hugetlb.h
index ec21cedd7149..f57236dfc8f4 100644
--- a/trunk/include/asm-x86/hugetlb.h
+++ b/trunk/include/asm-x86/hugetlb.h
@@ -46,4 +46,9 @@ static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
 	return ptep_get_and_clear(mm, addr, ptep);
 }
 
+static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
+					 unsigned long addr, pte_t *ptep)
+{
+}
+
 #endif /* _ASM_X86_HUGETLB_H */
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index d36e1f11a5f2..262d0a93d2b6 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -892,6 +892,7 @@ static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
 	ptep = huge_pte_offset(mm, address & HPAGE_MASK);
 	if (likely(pte_same(*ptep, pte))) {
 		/* Break COW */
+		huge_ptep_clear_flush(vma, address, ptep);
 		set_huge_pte_at(mm, address, ptep,
 				make_huge_pte(vma, new_page, 1));
 		/* Make the old page be freed below */