dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

x86: xen: Cleanup and remove x86_init.paging.pagetable_setup_done() 

At this stage x86_init.paging.pagetable_setup_done is only used in the
XEN case. Move its content in the x86_init.paging.pagetable_init setup
function and remove the now unused x86_init.paging.pagetable_setup_done
remaining infrastructure.

Signed-off-by: Attilio Rao <attilio.rao@citrix.com>
Acked-by: <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-5-git-send-email-attilio.rao@citrix.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Attilio Rao 2012-08-21 21:22:40 +01:00 committed by Thomas Gleixner
parent 843b8ed2ec
commit c711288727
6 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/pgtable_types.h
View File

@ -304,10 +304,8 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pte);
extern void native_pagetable_reserve(u64 start, u64 end);
#ifdef CONFIG_X86_32
extern void native_pagetable_init(void);
extern void native_pagetable_setup_done(pgd_t *base);
#else
#define native_pagetable_init paging_init
#define native_pagetable_setup_done x86_init_pgd_done_noop
#endif
struct seq_file;

2
arch/x86/include/asm/x86_init.h
View File

@ -82,11 +82,9 @@ struct x86_init_mapping {
/**
* struct x86_init_paging - platform specific paging functions
* @pagetable_init: platform specific paging initialization call
* @pagetable_setup_done: platform specific post paging_init() call
*/
struct x86_init_paging {
void (*pagetable_init)(void);
void (*pagetable_setup_done)(pgd_t *base);
};
/**

1
arch/x86/kernel/setup.c
View File

@ -962,7 +962,6 @@ void __init setup_arch(char **cmdline_p)
#endif
x86_init.paging.pagetable_init();
x86_init.paging.pagetable_setup_done(swapper_pg_dir);
if (boot_cpu_data.cpuid_level >= 0) {
/* A CPU has %cr4 if and only if it has CPUID */

2
arch/x86/kernel/x86_init.c
View File

@ -26,7 +26,6 @@
void __cpuinit x86_init_noop(void) { }
void __init x86_init_uint_noop(unsigned int unused) { }
void __init x86_init_pgd_done_noop(pgd_t *unused) { }
int __init iommu_init_noop(void) { return 0; }
void iommu_shutdown_noop(void) { }
@ -69,7 +68,6 @@ struct x86_init_ops x86_init __initdata = {
.paging = {
.pagetable_init = native_pagetable_init,
.pagetable_setup_done = native_pagetable_setup_done,
},
.timers = {

4
arch/x86/mm/init_32.c
View File

@ -478,10 +478,6 @@ void __init native_pagetable_init(void)
paging_init();
}
void __init native_pagetable_setup_done(pgd_t *base)
{
}
/*
* Build a proper pagetable for the kernel mappings. Up until this
* point, we've been running on some set of pagetables constructed by

13
arch/x86/xen/mmu.c
View File

@ -1174,9 +1174,13 @@ static void xen_exit_mmap(struct mm_struct *mm)
spin_unlock(&mm->page_table_lock);
}
static void xen_post_allocator_init(void);
static void __init xen_pagetable_init(void)
{
paging_init();
xen_setup_shared_info();
xen_post_allocator_init();
}
static __init void xen_mapping_pagetable_reserve(u64 start, u64 end)
@ -1193,14 +1197,6 @@ static __init void xen_mapping_pagetable_reserve(u64 start, u64 end)
}
}
static void xen_post_allocator_init(void);
static void __init xen_pagetable_setup_done(pgd_t *base)
{
xen_setup_shared_info();
xen_post_allocator_init();
}
static void xen_write_cr2(unsigned long cr2)
{
this_cpu_read(xen_vcpu)->arch.cr2 = cr2;
@ -2070,7 +2066,6 @@ void __init xen_init_mmu_ops(void)
{
x86_init.mapping.pagetable_reserve = xen_mapping_pagetable_reserve;
x86_init.paging.pagetable_init = xen_pagetable_init;
x86_init.paging.pagetable_setup_done = xen_pagetable_setup_done;
pv_mmu_ops = xen_mmu_ops;
memset(dummy_mapping, 0xff, PAGE_SIZE);