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

Commit 1d262d3a authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: put paravirt stubs into common asm/pgalloc.h 



Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1ec1fe73

arch/x86/mm/pageattr.c

+0 −2
Original line number Diff line number Diff line
@@ -483,9 +483,7 @@ static int split_large_page(pte_t *kpte, unsigned long address) 
		goto out_unlock;



	pbase = (pte_t *)page_address(base);

#ifdef CONFIG_X86_32

	paravirt_alloc_pt(&init_mm, page_to_pfn(base));

#endif

	ref_prot = pte_pgprot(pte_clrhuge(*kpte));



#ifdef CONFIG_X86_64

include/asm-x86/pgalloc.h

+10 −0
Original line number Diff line number Diff line
@@ -5,6 +5,16 @@ 
#include <linux/mm.h>		/* for struct page */

#include <linux/pagemap.h>



#ifdef CONFIG_PARAVIRT

#include <asm/paravirt.h>

#else

#define paravirt_alloc_pt(mm, pfn) do { } while (0)

#define paravirt_alloc_pd(mm, pfn) do { } while (0)

#define paravirt_alloc_pd_clone(pfn, clonepfn, start, count) do { } while (0)

#define paravirt_release_pt(pfn) do { } while (0)

#define paravirt_release_pd(pfn) do { } while (0)

#endif



/*

 * Allocate and free page tables.

 */

include/asm-x86/pgalloc_32.h

+0 −10
Original line number Diff line number Diff line 
#ifndef _I386_PGALLOC_H

#define _I386_PGALLOC_H



#ifdef CONFIG_PARAVIRT

#include <asm/paravirt.h>

#else

#define paravirt_alloc_pt(mm, pfn) do { } while (0)

#define paravirt_alloc_pd(mm, pfn) do { } while (0)

#define paravirt_alloc_pd_clone(pfn, clonepfn, start, count) do { } while (0)

#define paravirt_release_pt(pfn) do { } while (0)

#define paravirt_release_pd(pfn) do { } while (0)

#endif



static inline void pmd_populate_kernel(struct mm_struct *mm,

				       pmd_t *pmd, pte_t *pte)

{