Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e21ea246 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds
Browse files

mm: remove ptep_test_and_clear_dirty and ptep_clear_flush_dirty 



Nobody is using ptep_test_and_clear_dirty and ptep_clear_flush_dirty.  Remove
the functions from all architectures.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f0e47c22

include/asm-frv/pgtable.h

+0 −8
Original line number Diff line number Diff line
@@ -388,13 +388,6 @@ static inline pte_t pte_mkdirty(pte_t pte) { (pte).pte |= _PAGE_DIRTY; return pt 
static inline pte_t pte_mkyoung(pte_t pte)	{ (pte).pte |= _PAGE_ACCESSED; return pte; }

static inline pte_t pte_mkwrite(pte_t pte)	{ (pte).pte &= ~_PAGE_WP; return pte; }



static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)

{

	int i = test_and_clear_bit(_PAGE_BIT_DIRTY, ptep);

	asm volatile("dcf %M0" :: "U"(*ptep));

	return i;

}



static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)

{

	int i = test_and_clear_bit(_PAGE_BIT_ACCESSED, ptep);
@@ -504,7 +497,6 @@ static inline int pte_file(pte_t pte) 
		remap_pfn_range(vma, vaddr, pfn, size, prot)



#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG

#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY

#define __HAVE_ARCH_PTEP_GET_AND_CLEAR

#define __HAVE_ARCH_PTEP_SET_WRPROTECT

#define __HAVE_ARCH_PTE_SAME

include/asm-generic/pgtable.h

+0 −25
Original line number Diff line number Diff line
@@ -49,31 +49,6 @@ 
})

#endif



#ifndef __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY

#define ptep_test_and_clear_dirty(__vma, __address, __ptep)		\

({									\

	pte_t __pte = *__ptep;						\

	int r = 1;							\

	if (!pte_dirty(__pte))						\

		r = 0;							\

	else								\

		set_pte_at((__vma)->vm_mm, (__address), (__ptep),	\

			   pte_mkclean(__pte));				\

	r;								\

})

#endif



#ifndef __HAVE_ARCH_PTEP_CLEAR_DIRTY_FLUSH

#define ptep_clear_flush_dirty(__vma, __address, __ptep)		\

({									\

	int __dirty;							\

	__dirty = ptep_test_and_clear_dirty(__vma, __address, __ptep);	\

	if (__dirty)							\

		flush_tlb_page(__vma, __address);			\

	__dirty;							\

})

#endif



#ifndef __HAVE_ARCH_PTEP_GET_AND_CLEAR

#define ptep_get_and_clear(__mm, __address, __ptep)			\

({									\

include/asm-i386/pgtable.h

+0 −21
Original line number Diff line number Diff line
@@ -289,17 +289,6 @@ static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep) 
	__changed;							\

})



#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY

#define ptep_test_and_clear_dirty(vma, addr, ptep) ({			\

	int __ret = 0;							\

	if (pte_dirty(*(ptep)))						\

		__ret = test_and_clear_bit(_PAGE_BIT_DIRTY,		\

						&(ptep)->pte_low);	\

	if (__ret)							\

		pte_update((vma)->vm_mm, addr, ptep);			\

	__ret;								\

})



#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG

#define ptep_test_and_clear_young(vma, addr, ptep) ({			\

	int __ret = 0;							\
@@ -311,16 +300,6 @@ static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep) 
	__ret;								\

})



#define __HAVE_ARCH_PTEP_CLEAR_DIRTY_FLUSH

#define ptep_clear_flush_dirty(vma, address, ptep)			\

({									\

	int __dirty;							\

	__dirty = ptep_test_and_clear_dirty((vma), (address), (ptep));	\

	if (__dirty)							\

		flush_tlb_page(vma, address);				\

	__dirty;							\

})



#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH

#define ptep_clear_flush_young(vma, address, ptep)			\

({									\

include/asm-ia64/pgtable.h

+0 −17
Original line number Diff line number Diff line
@@ -395,22 +395,6 @@ ptep_test_and_clear_young (struct vm_area_struct *vma, unsigned long addr, pte_t 
#endif

}



static inline int

ptep_test_and_clear_dirty (struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)

{

#ifdef CONFIG_SMP

	if (!pte_dirty(*ptep))

		return 0;

	return test_and_clear_bit(_PAGE_D_BIT, ptep);

#else

	pte_t pte = *ptep;

	if (!pte_dirty(pte))

		return 0;

	set_pte_at(vma->vm_mm, addr, ptep, pte_mkclean(pte));

	return 1;

#endif

}



static inline pte_t

ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)

{
@@ -590,7 +574,6 @@ extern void lazy_mmu_prot_update (pte_t pte); 
#endif



#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG

#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY

#define __HAVE_ARCH_PTEP_GET_AND_CLEAR

#define __HAVE_ARCH_PTEP_SET_WRPROTECT

#define __HAVE_ARCH_PTE_SAME

include/asm-m32r/pgtable.h

+0 −6
Original line number Diff line number Diff line
@@ -250,11 +250,6 @@ static inline pte_t pte_mkwrite(pte_t pte) 
	return pte;

}



static inline  int ptep_test_and_clear_dirty(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)

{

	return test_and_clear_bit(_PAGE_BIT_DIRTY, ptep);

}



static inline  int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)

{

	return test_and_clear_bit(_PAGE_BIT_ACCESSED, ptep);
@@ -348,7 +343,6 @@ static inline void pmd_set(pmd_t * pmdp, pte_t * ptep) 
		remap_pfn_range(vma, vaddr, pfn, size, prot)



#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG

#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY

#define __HAVE_ARCH_PTEP_GET_AND_CLEAR

#define __HAVE_ARCH_PTEP_SET_WRPROTECT

#define __HAVE_ARCH_PTE_SAME