ia64/xen-unstable

changeset 13997:7c739272bac8

linux/x86_64: miscellaneous initialization code cleanup
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Fri Feb 16 16:05:01 2007 +0000 (2007-02-16)
parents efffaad38089
children 32a059913591
files linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Fri Feb 16 15:50:02 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Fri Feb 16 16:05:01 2007 +0000
     1.3 @@ -90,9 +90,6 @@ EXPORT_SYMBOL(HYPERVISOR_shared_info);
     1.4  extern char hypercall_page[PAGE_SIZE];
     1.5  EXPORT_SYMBOL(hypercall_page);
     1.6  
     1.7 -/* Allows setting of maximum possible memory size  */
     1.8 -unsigned long xen_override_max_pfn;
     1.9 -
    1.10  static int xen_panic_event(struct notifier_block *, unsigned long, void *);
    1.11  static struct notifier_block xen_panic_block = {
    1.12  	xen_panic_event, NULL, 0 /* try to go last */
    1.13 @@ -717,7 +714,6 @@ void __init setup_arch(char **cmdline_p)
    1.14  	/* reserve ebda region */
    1.15  	if (ebda_addr)
    1.16  		reserve_bootmem_generic(ebda_addr, ebda_size);
    1.17 -#endif
    1.18  
    1.19  #ifdef CONFIG_SMP
    1.20  	/*
    1.21 @@ -730,6 +726,7 @@ void __init setup_arch(char **cmdline_p)
    1.22  	/* Reserve SMP trampoline */
    1.23  	reserve_bootmem_generic(SMP_TRAMPOLINE_BASE, PAGE_SIZE);
    1.24  #endif
    1.25 +#endif
    1.26  
    1.27  #ifdef CONFIG_ACPI_SLEEP
    1.28         /*
     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c	Fri Feb 16 15:50:02 2007 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c	Fri Feb 16 16:05:01 2007 +0000
     2.3 @@ -77,7 +77,7 @@ extern unsigned long start_pfn;
     2.4  	(((mfn_to_pfn((addr) >> PAGE_SHIFT)) << PAGE_SHIFT) +	\
     2.5  	__START_KERNEL_map)))
     2.6  
     2.7 -static void early_make_page_readonly(void *va, unsigned int feature)
     2.8 +static void __meminit early_make_page_readonly(void *va, unsigned int feature)
     2.9  {
    2.10  	unsigned long addr, _va = (unsigned long)va;
    2.11  	pte_t pte, *ptep;
    2.12 @@ -378,15 +378,6 @@ void __init
    2.13  
    2.14  unsigned long __initdata table_start, table_end; 
    2.15  
    2.16 -unsigned long get_machine_pfn(unsigned long addr)
    2.17 -{
    2.18 -	pud_t* pud = pud_offset_k(NULL, addr);
    2.19 -	pmd_t* pmd = pmd_offset(pud, addr);
    2.20 -	pte_t *pte = pte_offset_kernel(pmd, addr);
    2.21 -
    2.22 -	return pte_mfn(*pte);
    2.23 -} 
    2.24 -
    2.25  static __meminit void *alloc_static_page(unsigned long *phys)
    2.26  {
    2.27  	unsigned long va = (start_pfn << PAGE_SHIFT) + __START_KERNEL_map;
    2.28 @@ -532,10 +523,6 @@ void __init xen_init_pt(void)
    2.29  {
    2.30  	unsigned long addr, *page;
    2.31  
    2.32 -	memset((void *)init_level4_pgt,   0, PAGE_SIZE);
    2.33 -	memset((void *)level3_kernel_pgt, 0, PAGE_SIZE);
    2.34 -	memset((void *)level2_kernel_pgt, 0, PAGE_SIZE);
    2.35 -
    2.36  	/* Find the initial pte page that was built for us. */
    2.37  	page = (unsigned long *)xen_start_info->pt_base;
    2.38  	addr = page[pgd_index(__START_KERNEL_map)];
    2.39 @@ -596,7 +583,7 @@ void __init xen_init_pt(void)
    2.40  		mk_kernel_pgd(__pa_symbol(level3_user_pgt)));
    2.41  }
    2.42  
    2.43 -void __init extend_init_mapping(unsigned long tables_space)
    2.44 +static void __init extend_init_mapping(unsigned long tables_space)
    2.45  {
    2.46  	unsigned long va = __START_KERNEL_map;
    2.47  	unsigned long phys, addr, *pte_page;