UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: Remove base argument from x86_init.paging.pagetable_setup_start 

We either use swapper_pg_dir or the argument is unused. Preparatory
patch to simplify platform pagetable setup further.

Signed-off-by: Attilio Rao <attilio.rao@citrix.com>
Ackedb-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-2-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:37 +01:00 committed by Thomas Gleixner
parent 55d512e245
commit 73090f8993
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,11 +303,11 @@ 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_setup_start(pgd_t *base);
extern void native_pagetable_setup_start(void);
extern void native_pagetable_setup_done(pgd_t *base);
#else
#define native_pagetable_setup_start x86_init_pgd_noop
#define native_pagetable_setup_done x86_init_pgd_noop
#define native_pagetable_setup_start x86_init_pgd_start_noop
#define native_pagetable_setup_done x86_init_pgd_done_noop
#endif
struct seq_file;

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

@ -85,7 +85,7 @@ struct x86_init_mapping {
* @pagetable_setup_done: platform specific post paging_init() call
*/
struct x86_init_paging {
void (*pagetable_setup_start)(pgd_t *base);
void (*pagetable_setup_start)(void);
void (*pagetable_setup_done)(pgd_t *base);
};

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

@ -961,7 +961,7 @@ void __init setup_arch(char **cmdline_p)
kvmclock_init();
#endif
x86_init.paging.pagetable_setup_start(swapper_pg_dir);
x86_init.paging.pagetable_setup_start();
paging_init();
x86_init.paging.pagetable_setup_done(swapper_pg_dir);

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

@ -26,7 +26,8 @@
void __cpuinit x86_init_noop(void) { }
void __init x86_init_uint_noop(unsigned int unused) { }
void __init x86_init_pgd_noop(pgd_t *unused) { }
void __init x86_init_pgd_start_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) { }

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

@ -445,10 +445,10 @@ static inline void permanent_kmaps_init(pgd_t *pgd_base)
}
#endif /* CONFIG_HIGHMEM */
void __init native_pagetable_setup_start(pgd_t *base)
void __init native_pagetable_setup_start(void)
{
unsigned long pfn, va;
pgd_t *pgd;
pgd_t *pgd, *base = swapper_pg_dir;
pud_t *pud;
pmd_t *pmd;
pte_t *pte;

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

@ -1174,7 +1174,7 @@ static void xen_exit_mmap(struct mm_struct *mm)
spin_unlock(&mm->page_table_lock);
}
static void __init xen_pagetable_setup_start(pgd_t *base)
static void __init xen_pagetable_setup_start(void)
{
}