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

Commit 602e0186 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Ingo Molnar
Browse files

x86/mm: Convert update_mmu_cache() and update_mmu_cache_pmd() to functions 



Converting macros to functions unhide type problems before
changes will be integrated and trigger problems on other
architectures.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d59fe3f1

arch/x86/include/asm/pgtable.h

+12 −0
Original line number Diff line number Diff line
@@ -781,6 +781,18 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) 
       memcpy(dst, src, count * sizeof(pgd_t));

}



/*

 * The x86 doesn't have any external MMU info: the kernel page

 * tables contain all the necessary information.

 */

static inline void update_mmu_cache(struct vm_area_struct *vma,

		unsigned long addr, pte_t *ptep)

{

}

static inline void update_mmu_cache_pmd(struct vm_area_struct *vma,

		unsigned long addr, pmd_t *pmd)

{

}



#include <asm-generic/pgtable.h>

#endif	/* __ASSEMBLY__ */

arch/x86/include/asm/pgtable_32.h

+0 −7
Original line number Diff line number Diff line
@@ -66,13 +66,6 @@ do { \ 
	__flush_tlb_one((vaddr));		\

} while (0)



/*

 * The i386 doesn't have any external MMU info: the kernel page

 * tables contain all the necessary information.

 */

#define update_mmu_cache(vma, address, ptep) do { } while (0)

#define update_mmu_cache_pmd(vma, address, pmd) do { } while (0)



#endif /* !__ASSEMBLY__ */



/*

arch/x86/include/asm/pgtable_64.h

+0 −3
Original line number Diff line number Diff line
@@ -142,9 +142,6 @@ static inline int pgd_large(pgd_t pgd) { return 0; } 
#define pte_offset_map(dir, address) pte_offset_kernel((dir), (address))

#define pte_unmap(pte) ((void)(pte))/* NOP */



#define update_mmu_cache(vma, address, ptep) do { } while (0)

#define update_mmu_cache_pmd(vma, address, pmd) do { } while (0)



/* Encode and de-code a swap entry */

#if _PAGE_BIT_FILE < _PAGE_BIT_PROTNONE

#define SWP_TYPE_BITS (_PAGE_BIT_FILE - _PAGE_BIT_PRESENT - 1)