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

Commit 816422ad authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

asm-generic, mm: pgtable: consolidate zero page helpers 



We have two different implementation of is_zero_pfn() and my_zero_pfn()
helpers: for architectures with and without zero page coloring.

Let's consolidate them in <asm-generic/pgtable.h>.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 56f2fb14

arch/mips/include/asm/pgtable.h

+1 −10
Original line number Diff line number Diff line
@@ -76,16 +76,7 @@ extern unsigned long zero_page_mask; 


#define ZERO_PAGE(vaddr) \

	(virt_to_page((void *)(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask))))



#define is_zero_pfn is_zero_pfn

static inline int is_zero_pfn(unsigned long pfn)

{

	extern unsigned long zero_pfn;

	unsigned long offset_from_zero_pfn = pfn - zero_pfn;

	return offset_from_zero_pfn <= (zero_page_mask >> PAGE_SHIFT);

}



#define my_zero_pfn(addr)	page_to_pfn(ZERO_PAGE(addr))

#define __HAVE_COLOR_ZERO_PAGE



extern void paging_init(void);

arch/s390/include/asm/pgtable.h

+1 −10
Original line number Diff line number Diff line
@@ -55,16 +55,7 @@ extern unsigned long zero_page_mask; 
#define ZERO_PAGE(vaddr) \

	(virt_to_page((void *)(empty_zero_page + \

	 (((unsigned long)(vaddr)) &zero_page_mask))))



#define is_zero_pfn is_zero_pfn

static inline int is_zero_pfn(unsigned long pfn)

{

	extern unsigned long zero_pfn;

	unsigned long offset_from_zero_pfn = pfn - zero_pfn;

	return offset_from_zero_pfn <= (zero_page_mask >> PAGE_SHIFT);

}



#define my_zero_pfn(addr)	page_to_pfn(ZERO_PAGE(addr))

#define __HAVE_COLOR_ZERO_PAGE



#endif /* !__ASSEMBLY__ */

include/asm-generic/pgtable.h

+26 −0
Original line number Diff line number Diff line
@@ -449,6 +449,32 @@ extern void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn, 
			unsigned long size);

#endif



#ifdef __HAVE_COLOR_ZERO_PAGE

static inline int is_zero_pfn(unsigned long pfn)

{

	extern unsigned long zero_pfn;

	unsigned long offset_from_zero_pfn = pfn - zero_pfn;

	return offset_from_zero_pfn <= (zero_page_mask >> PAGE_SHIFT);

}



static inline unsigned long my_zero_pfn(unsigned long addr)

{

	return page_to_pfn(ZERO_PAGE(addr));

}

#else

static inline int is_zero_pfn(unsigned long pfn)

{

	extern unsigned long zero_pfn;

	return pfn == zero_pfn;

}



static inline unsigned long my_zero_pfn(unsigned long addr)

{

	extern unsigned long zero_pfn;

	return zero_pfn;

}

#endif



#ifdef CONFIG_MMU



#ifndef CONFIG_TRANSPARENT_HUGEPAGE

include/linux/mm.h

+0 −8
Original line number Diff line number Diff line
@@ -516,14 +516,6 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma) 
}

#endif



#ifndef my_zero_pfn

static inline unsigned long my_zero_pfn(unsigned long addr)

{

	extern unsigned long zero_pfn;

	return zero_pfn;

}

#endif



/*

 * Multiple processes may "see" the same page. E.g. for untouched

 * mappings of /dev/null, all processes see the same page full of

mm/memory.c

+0 −7
Original line number Diff line number Diff line
@@ -717,13 +717,6 @@ static inline bool is_cow_mapping(vm_flags_t flags) 
	return (flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE;

}



#ifndef is_zero_pfn

static inline int is_zero_pfn(unsigned long pfn)

{

	return pfn == zero_pfn;

}

#endif



/*

 * vm_normal_page -- This function gets the "struct page" associated with a pte.

 *