[PATCH 4/8] 2.6.17: miscellaneous changes

[PATCH 4/8] 2.6.17: miscellaneous changes

[Jan Beulich]

These are miscellaneous changes that don't fit in a specific category.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

Index: head-2007-02-08/arch/x86_64/kernel/entry-xen.S
===================================================================
--- head-2007-02-08.orig/arch/x86_64/kernel/entry-xen.S	2007-02-08 17:09:04.000000000 +0100
+++ head-2007-02-08/arch/x86_64/kernel/entry-xen.S	2007-02-08 17:09:47.000000000 +0100
@@ -32,9 +32,6 @@
  */
 
 #define ASSEMBLY 1
-#ifdef CONFIG_DEBUG_INFO
-#undef CONFIG_DEBUG_INFO
-#endif
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/smp.h>
@@ -537,6 +534,7 @@ END(stub_rt_sigreturn)
  */ 
 
 retint_check:
+	CFI_DEFAULT_STACK
 	movl threadinfo_flags(%rcx),%edx
 	andl %edi,%edx
 	CFI_REMEMBER_STATE
Index: head-2007-02-08/arch/x86_64/kernel/head-xen.S
===================================================================
--- head-2007-02-08.orig/arch/x86_64/kernel/head-xen.S	2007-02-08 17:07:13.000000000 +0100
+++ head-2007-02-08/arch/x86_64/kernel/head-xen.S	2007-02-08 17:09:47.000000000 +0100
@@ -25,7 +25,7 @@
 
 #include <xen/interface/elfnote.h>
 
-	.text
+	.section .bootstrap.text, "ax", @progbits
 	.code64
 #define VIRT_ENTRY_OFFSET 0x0
 .org VIRT_ENTRY_OFFSET
Index: head-2007-02-08/arch/x86_64/kernel/mpparse-xen.c
===================================================================
--- head-2007-02-08.orig/arch/x86_64/kernel/mpparse-xen.c	2007-02-08 17:07:13.000000000 +0100
+++ head-2007-02-08/arch/x86_64/kernel/mpparse-xen.c	2007-02-08 17:09:47.000000000 +0100
@@ -170,7 +170,7 @@ static void __cpuinit MP_processor_info 
 	cpu_set(cpu, cpu_present_map);
 }
 #else
-void __init MP_processor_info (struct mpc_config_processor *m)
+static void __cpuinit MP_processor_info (struct mpc_config_processor *m)
 {
 	num_processors++;
 }
Index: head-2007-02-08/arch/x86_64/kernel/process-xen.c
===================================================================
--- head-2007-02-08.orig/arch/x86_64/kernel/process-xen.c	2007-02-08 17:07:13.000000000 +0100
+++ head-2007-02-08/arch/x86_64/kernel/process-xen.c	2007-02-08 17:09:47.000000000 +0100
@@ -499,8 +499,6 @@ __switch_to(struct task_struct *prev_p, 
 	 * This is basically '__unlazy_fpu', except that we queue a
 	 * multicall to indicate FPU task switch, rather than
 	 * synchronously trapping to Xen.
-	 * This must be here to ensure both math_state_restore() and
-	 * kernel_fpu_begin() work consistently. 
 	 * The AMD workaround requires it to be after DS reload, or
 	 * after DS has been cleared, which we do in __prepare_arch_switch.
 	 */
@@ -579,7 +577,7 @@ __switch_to(struct task_struct *prev_p, 
 		HYPERVISOR_set_segment_base(SEGBASE_GS_USER, next->gs); 
 
 	/* 
-	 * Switch the PDA and FPU contexts.
+	 * Switch the PDA context.
 	 */
 	prev->userrsp = read_pda(oldrsp); 
 	write_pda(oldrsp, next->userrsp); 
Index: head-2007-02-08/arch/x86_64/kernel/setup-xen.c
===================================================================
--- head-2007-02-08.orig/arch/x86_64/kernel/setup-xen.c	2007-02-08 17:07:13.000000000 +0100
+++ head-2007-02-08/arch/x86_64/kernel/setup-xen.c	2007-02-08 17:09:47.000000000 +0100
@@ -580,6 +580,8 @@ static void discover_ebda(void)
 	if (ebda_size > 64*1024)
 		ebda_size = 64*1024;
 }
+#else
+#define discover_ebda() ((void)0)
 #endif
 
 void __init setup_arch(char **cmdline_p)
@@ -675,9 +677,7 @@ void __init setup_arch(char **cmdline_p)
 
 	check_efer();
 
-#ifndef CONFIG_XEN
 	discover_ebda();
-#endif
 
 	init_memory_mapping(0, (end_pfn_map << PAGE_SHIFT));
 
Index: head-2007-02-08/arch/x86_64/kernel/setup-xen.c
===================================================================
--- head-2007-02-08.orig/arch/x86_64/kernel/setup-xen.c	2007-02-08 17:07:13.000000000 +0100
+++ head-2007-02-08/arch/x86_64/kernel/setup-xen.c	2007-02-08 17:09:47.000000000 +0100
@@ -1378,9 +1378,7 @@ void __cpuinit identify_cpu(struct cpuin
 			c->x86_capability[2] = cpuid_edx(0x80860001);
 	}
 
-#ifdef CONFIG_X86_XEN_GENAPIC
 	c->apicid = phys_pkg_id(0);
-#endif
 
 	/*
 	 * Vendor-specific initialization.  In this section we
Index: head-2007-02-08/arch/x86_64/mm/init-xen.c
===================================================================
--- head-2007-02-08.orig/arch/x86_64/mm/init-xen.c	2007-02-08 17:07:13.000000000 +0100
+++ head-2007-02-08/arch/x86_64/mm/init-xen.c	2007-02-08 17:09:47.000000000 +0100
@@ -279,8 +279,8 @@ static __init void set_pte_phys(unsigned
 	__flush_tlb_one(vaddr);
 }
 
-static void set_pte_phys_ma(unsigned long vaddr,
-			 unsigned long phys, pgprot_t prot)
+static __init void set_pte_phys_ma(unsigned long vaddr,
+				   unsigned long phys, pgprot_t prot)
 {
 	pgd_t *pgd;
 	pud_t *pud;
@@ -361,9 +361,10 @@ __set_fixmap (enum fixed_addresses idx, 
 }
 
 /*
- * At this point it only supports vsyscall area.
+ * This only supports vsyscall area.
  */
-void __set_fixmap_user (enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
+void __init
+__set_fixmap_user (enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
 {
 	unsigned long address = __fix_to_virt(idx);
 
Index: head-2007-02-08/drivers/xen/core/smpboot.c
===================================================================
--- head-2007-02-08.orig/drivers/xen/core/smpboot.c	2007-02-08 17:07:13.000000000 +0100
+++ head-2007-02-08/drivers/xen/core/smpboot.c	2007-02-08 17:09:47.000000000 +0100
@@ -349,8 +349,7 @@ void __init smp_prepare_cpus(unsigned in
 
 void __devinit smp_prepare_boot_cpu(void)
 {
-	cpu_present_map  = cpumask_of_cpu(0);
-	cpu_online_map   = cpumask_of_cpu(0);
+	prefill_possible_map();
 }
 
 #ifdef CONFIG_HOTPLUG_CPU