ia64/xen-unstable

changeset 13978:477a3bde3b61

linux: miscellaneous changes after upgrade through 2.6.17.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Thu Feb 15 14:12:32 2007 +0000 (2007-02-15)
parents beab19d957de
children 61de36b8be81
files linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S linux-2.6-xen-sparse/arch/x86_64/kernel/mpparse-xen.c linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S	Thu Feb 15 14:05:58 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S	Thu Feb 15 14:12:32 2007 +0000
     1.3 @@ -32,9 +32,6 @@
     1.4   */
     1.5  
     1.6  #define ASSEMBLY 1
     1.7 -#ifdef CONFIG_DEBUG_INFO
     1.8 -#undef CONFIG_DEBUG_INFO
     1.9 -#endif
    1.10  #include <linux/linkage.h>
    1.11  #include <asm/segment.h>
    1.12  #include <asm/smp.h>
    1.13 @@ -537,6 +534,7 @@ END(stub_rt_sigreturn)
    1.14   */ 
    1.15  
    1.16  retint_check:
    1.17 +	CFI_DEFAULT_STACK
    1.18  	movl threadinfo_flags(%rcx),%edx
    1.19  	andl %edi,%edx
    1.20  	CFI_REMEMBER_STATE
     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Thu Feb 15 14:05:58 2007 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Thu Feb 15 14:12:32 2007 +0000
     2.3 @@ -25,7 +25,7 @@
     2.4  
     2.5  #include <xen/interface/elfnote.h>
     2.6  
     2.7 -	.text
     2.8 +	.section .bootstrap.text, "ax", @progbits
     2.9  	.code64
    2.10  #define VIRT_ENTRY_OFFSET 0x0
    2.11  .org VIRT_ENTRY_OFFSET
     3.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/mpparse-xen.c	Thu Feb 15 14:05:58 2007 +0000
     3.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/mpparse-xen.c	Thu Feb 15 14:12:32 2007 +0000
     3.3 @@ -170,7 +170,7 @@ static void __cpuinit MP_processor_info 
     3.4  	cpu_set(cpu, cpu_present_map);
     3.5  }
     3.6  #else
     3.7 -void __init MP_processor_info (struct mpc_config_processor *m)
     3.8 +static void __cpuinit MP_processor_info (struct mpc_config_processor *m)
     3.9  {
    3.10  	num_processors++;
    3.11  }
     4.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c	Thu Feb 15 14:05:58 2007 +0000
     4.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c	Thu Feb 15 14:12:32 2007 +0000
     4.3 @@ -499,8 +499,6 @@ static inline void __save_init_fpu( stru
     4.4  	 * This is basically '__unlazy_fpu', except that we queue a
     4.5  	 * multicall to indicate FPU task switch, rather than
     4.6  	 * synchronously trapping to Xen.
     4.7 -	 * This must be here to ensure both math_state_restore() and
     4.8 -	 * kernel_fpu_begin() work consistently. 
     4.9  	 * The AMD workaround requires it to be after DS reload, or
    4.10  	 * after DS has been cleared, which we do in __prepare_arch_switch.
    4.11  	 */
    4.12 @@ -579,7 +577,7 @@ static inline void __save_init_fpu( stru
    4.13  		HYPERVISOR_set_segment_base(SEGBASE_GS_USER, next->gs); 
    4.14  
    4.15  	/* 
    4.16 -	 * Switch the PDA and FPU contexts.
    4.17 +	 * Switch the PDA context.
    4.18  	 */
    4.19  	prev->userrsp = read_pda(oldrsp); 
    4.20  	write_pda(oldrsp, next->userrsp); 
     5.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Thu Feb 15 14:05:58 2007 +0000
     5.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Thu Feb 15 14:12:32 2007 +0000
     5.3 @@ -580,6 +580,8 @@ static void discover_ebda(void)
     5.4  	if (ebda_size > 64*1024)
     5.5  		ebda_size = 64*1024;
     5.6  }
     5.7 +#else
     5.8 +#define discover_ebda() ((void)0)
     5.9  #endif
    5.10  
    5.11  void __init setup_arch(char **cmdline_p)
    5.12 @@ -673,9 +675,7 @@ void __init setup_arch(char **cmdline_p)
    5.13  
    5.14  	check_efer();
    5.15  
    5.16 -#ifndef CONFIG_XEN
    5.17  	discover_ebda();
    5.18 -#endif
    5.19  
    5.20  	init_memory_mapping(0, (end_pfn_map << PAGE_SHIFT));
    5.21  
    5.22 @@ -1378,9 +1378,7 @@ void __cpuinit identify_cpu(struct cpuin
    5.23  			c->x86_capability[2] = cpuid_edx(0x80860001);
    5.24  	}
    5.25  
    5.26 -#ifdef CONFIG_X86_XEN_GENAPIC
    5.27  	c->apicid = phys_pkg_id(0);
    5.28 -#endif
    5.29  
    5.30  	/*
    5.31  	 * Vendor-specific initialization.  In this section we
     6.1 --- a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c	Thu Feb 15 14:05:58 2007 +0000
     6.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c	Thu Feb 15 14:12:32 2007 +0000
     6.3 @@ -279,8 +279,8 @@ static __init void set_pte_phys(unsigned
     6.4  	__flush_tlb_one(vaddr);
     6.5  }
     6.6  
     6.7 -static void set_pte_phys_ma(unsigned long vaddr,
     6.8 -			 unsigned long phys, pgprot_t prot)
     6.9 +static __init void set_pte_phys_ma(unsigned long vaddr,
    6.10 +				   unsigned long phys, pgprot_t prot)
    6.11  {
    6.12  	pgd_t *pgd;
    6.13  	pud_t *pud;
    6.14 @@ -361,9 +361,10 @@ void __init
    6.15  }
    6.16  
    6.17  /*
    6.18 - * At this point it only supports vsyscall area.
    6.19 + * This only supports vsyscall area.
    6.20   */
    6.21 -void __set_fixmap_user (enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
    6.22 +void __init
    6.23 +__set_fixmap_user (enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
    6.24  {
    6.25  	unsigned long address = __fix_to_virt(idx);
    6.26  
     7.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Thu Feb 15 14:05:58 2007 +0000
     7.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Thu Feb 15 14:12:32 2007 +0000
     7.3 @@ -349,8 +349,7 @@ void __init smp_prepare_cpus(unsigned in
     7.4  
     7.5  void __devinit smp_prepare_boot_cpu(void)
     7.6  {
     7.7 -	cpu_present_map  = cpumask_of_cpu(0);
     7.8 -	cpu_online_map   = cpumask_of_cpu(0);
     7.9 +	prefill_possible_map();
    7.10  }
    7.11  
    7.12  #ifdef CONFIG_HOTPLUG_CPU