1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig	Wed Apr 20 10:00:10 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig	Wed Apr 20 10:23:38 2005 +0000
     1.3 @@ -457,22 +457,22 @@ config PREEMPT_BKL
     1.4  #	   enters thermal throttling.
     1.5  
     1.6  config MICROCODE
     1.7 -	 tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
     1.8 +	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
     1.9  	 depends on XEN_PRIVILEGED_GUEST
    1.10 -	 ---help---
    1.11 -	   If you say Y here and also to "/dev file system support" in the
    1.12 -	   'File systems' section, you will be able to update the microcode on
    1.13 -	   Intel processors in the IA32 family, e.g. Pentium Pro, Pentium II,
    1.14 -	   Pentium III, Pentium 4, Xeon etc.  You will obviously need the
    1.15 -	   actual microcode binary data itself which is not shipped with the
    1.16 -	   Linux kernel.
    1.17 +	---help---
    1.18 +	  If you say Y here and also to "/dev file system support" in the
    1.19 +	  'File systems' section, you will be able to update the microcode on
    1.20 +	  Intel processors in the IA32 family, e.g. Pentium Pro, Pentium II,
    1.21 +	  Pentium III, Pentium 4, Xeon etc.  You will obviously need the
    1.22 +	  actual microcode binary data itself which is not shipped with the
    1.23 +	  Linux kernel.
    1.24  
    1.25 -	   For latest news and information on obtaining all the required
    1.26 -	   ingredients for this driver, check:
    1.27 -	   <http://www.urbanmyth.org/microcode/>.
    1.28 +	  For latest news and information on obtaining all the required
    1.29 +	  ingredients for this driver, check:
    1.30 +	  <http://www.urbanmyth.org/microcode/>.
    1.31  
    1.32 -	   To compile this driver as a module, choose M here: the
    1.33 -	   module will be called microcode.
    1.34 +	  To compile this driver as a module, choose M here: the
    1.35 +	  module will be called microcode.
    1.36  
    1.37  #config X86_MSR
    1.38  #	 tristate "/dev/cpu/*/msr - Model-specific register support"

     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c	Wed Apr 20 10:00:10 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c	Wed Apr 20 10:23:38 2005 +0000
     2.3 @@ -600,7 +600,7 @@ void __init cpu_init (void)
     2.4  	 * Set up the per-thread TLS descriptor cache:
     2.5  	 */
     2.6  	memcpy(thread->tls_array, &get_cpu_gdt_table(cpu)[GDT_ENTRY_TLS_MIN],
     2.7 -	    GDT_ENTRY_TLS_ENTRIES * 8);
     2.8 +		GDT_ENTRY_TLS_ENTRIES * 8);
     2.9  
    2.10  	cpu_gdt_init(&cpu_gdt_descr[cpu]);
    2.11  

     3.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S	Wed Apr 20 10:00:10 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S	Wed Apr 20 10:23:38 2005 +0000
     3.3 @@ -67,10 +67,10 @@ checkCPUtype:
     3.4  
     3.5  	incb ready
     3.6  
     3.7 -	xorl %eax,%eax		# Clear FS/GS and LDT
     3.8 +	xorl %eax,%eax			# Clear FS/GS and LDT
     3.9  	movl %eax,%fs
    3.10  	movl %eax,%gs
    3.11 -	cld		# gcc2 wants the direction flag cleared at all times
    3.12 +	cld			# gcc2 wants the direction flag cleared at all times
    3.13  
    3.14  #ifdef CONFIG_SMP
    3.15  	movb ready, %cl	

     4.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c	Wed Apr 20 10:00:10 2005 +0000
     4.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c	Wed Apr 20 10:23:38 2005 +0000
     4.3 @@ -266,7 +266,7 @@ static unsigned long cpu_khz_ref = 0;
     4.4  
     4.5  static int
     4.6  time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
     4.7 -		      void *data)
     4.8 +		       void *data)
     4.9  {
    4.10  	struct cpufreq_freqs *freq = data;
    4.11  
    4.12 @@ -338,7 +338,7 @@ static int init_tsc(char* override)
    4.13  
    4.14  	/* (10^6 * 2^32) / cpu_hz = (10^3 * 2^32) / cpu_khz =
    4.15  	   (2^32 * 1 / (clocks/us)) */
    4.16 -	{	
    4.17 +	{
    4.18  		unsigned long eax=0, edx=1000;
    4.19  		__asm__("divl %2"
    4.20  		    :"=a" (fast_gettimeoffset_quotient), "=d" (edx)

     5.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c	Wed Apr 20 10:00:10 2005 +0000
     5.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c	Wed Apr 20 10:23:38 2005 +0000
     5.3 @@ -229,10 +229,10 @@ fastcall void do_page_fault(struct pt_re
     5.4  	error_code |= (regs->xcs & 2) << 1;
     5.5  	if (regs->eflags & X86_EFLAGS_VM)
     5.6  		error_code |= 4;
     5.7 -		
     5.8 - 	if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
     5.9 - 					SIGSEGV) == NOTIFY_STOP)
    5.10 - 		return;
    5.11 +
    5.12 +	if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
    5.13 +					SIGSEGV) == NOTIFY_STOP)
    5.14 +		return;
    5.15  #if 0
    5.16  	/* It's safe to allow irq's after cr2 has been saved */
    5.17  	if (regs->eflags & (X86_EFLAGS_IF|VM_MASK))

     6.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c	Wed Apr 20 10:00:10 2005 +0000
     6.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c	Wed Apr 20 10:23:38 2005 +0000
     6.3 @@ -71,13 +71,11 @@ struct pci_raw_ops pci_direct_xen = {
     6.4  	.write =	pci_conf_write,
     6.5  };
     6.6  
     6.7 -
     6.8  static int __init pci_direct_init(void)
     6.9  {
    6.10 -
    6.11 -        printk(KERN_INFO "PCI: Using configuration type Xen\n");
    6.12 -        raw_pci_ops = &pci_direct_xen;
    6.13 -        return 0;
    6.14 +	printk(KERN_INFO "PCI: Using configuration type Xen\n");
    6.15 +	raw_pci_ops = &pci_direct_xen;
    6.16 +	return 0;
    6.17  }
    6.18  
    6.19  arch_initcall(pci_direct_init);

     7.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c	Wed Apr 20 10:00:10 2005 +0000
     7.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c	Wed Apr 20 10:23:38 2005 +0000
     7.3 @@ -93,7 +93,7 @@ void pcibios_penalize_isa_irq(int irq)
     7.4  static int pirq_enable_irq(struct pci_dev *dev)
     7.5  {
     7.6  	int err;
     7.7 -	u8  pin;
     7.8 +	u8 pin;
     7.9  	physdev_op_t op;
    7.10  
    7.11  	/* Inform Xen that we are going to use this device. */