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

Commit 843b8ed2 authored by Attilio Rao's avatar Attilio Rao Committed by Thomas Gleixner
Browse files

x86: Move paging_init() call to x86_init.paging.pagetable_init() 



Move the paging_init() call to the platform specific pagetable_init()
function, so we can get rid of the extra pagetable_setup_done()
function pointer.

Signed-off-by: default avatarAttilio Rao <attilio.rao@citrix.com>
Acked-by: default avatar <konrad.wilk@oracle.com>
Cc: <Ian.Campbell@citrix.com>
Cc: <Stefano.Stabellini@eu.citrix.com>
Cc: <xen-devel@lists.xensource.com>
Link: http://lkml.kernel.org/r/1345580561-8506-4-git-send-email-attilio.rao@citrix.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7737b215

arch/x86/include/asm/pgtable_types.h

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ extern void native_pagetable_reserve(u64 start, u64 end); 
extern void native_pagetable_init(void);

extern void native_pagetable_setup_done(pgd_t *base);

#else

#define native_pagetable_init        x86_init_pgd_init_noop

#define native_pagetable_init        paging_init

#define native_pagetable_setup_done  x86_init_pgd_done_noop

#endif

arch/x86/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -962,7 +962,6 @@ void __init setup_arch(char **cmdline_p) 
#endif



	x86_init.paging.pagetable_init();

	paging_init();

	x86_init.paging.pagetable_setup_done(swapper_pg_dir);



	if (boot_cpu_data.cpuid_level >= 0) {

arch/x86/kernel/x86_init.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


void __cpuinit x86_init_noop(void) { }

void __init x86_init_uint_noop(unsigned int unused) { }

void __init x86_init_pgd_init_noop(void) { }

void __init x86_init_pgd_done_noop(pgd_t *unused) { }

int __init iommu_init_noop(void) { return 0; }

void iommu_shutdown_noop(void) { }

arch/x86/mm/init_32.c

+1 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ void __init native_pagetable_init(void) 
		pte_clear(NULL, va, pte);

	}

	paravirt_alloc_pmd(&init_mm, __pa(base) >> PAGE_SHIFT);

	paging_init();

}



void __init native_pagetable_setup_done(pgd_t *base)

arch/x86/xen/mmu.c

+1 −0
Original line number Diff line number Diff line
@@ -1176,6 +1176,7 @@ static void xen_exit_mmap(struct mm_struct *mm) 


static void __init xen_pagetable_init(void)

{

	paging_init();

}



static __init void xen_mapping_pagetable_reserve(u64 start, u64 end)