1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/acpi/boot.c	Wed May 04 19:53:11 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/acpi/boot.c	Wed May 04 20:08:16 2005 +0000
     1.3 @@ -109,17 +109,18 @@ enum acpi_irq_model_id		acpi_irq_model =
     1.4  
     1.5  char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
     1.6  {
     1.7 -        unsigned int i,j;
     1.8 +	unsigned int i,j;
     1.9  
    1.10 -        j = PAGE_ALIGN(size) >> PAGE_SHIFT;
    1.11 -        for (i = 0; (i < FIX_ACPI_PAGES) && j ; i++, j--) {
    1.12 -                __set_fixmap_ma(FIX_ACPI_END - i,
    1.13 -                                (phys_addr & PAGE_MASK) + (i << PAGE_SHIFT),
    1.14 -                                PAGE_KERNEL);
    1.15 -        }
    1.16 +	j = PAGE_ALIGN(size) >> PAGE_SHIFT;
    1.17 +	for (i = 0; (i < FIX_ACPI_PAGES) && j ; i++, j--) {
    1.18 +		__set_fixmap_ma(FIX_ACPI_END - i,
    1.19 +				(phys_addr & PAGE_MASK) + (i << PAGE_SHIFT),
    1.20 +				PAGE_KERNEL);
    1.21 +	}
    1.22  
    1.23 -        return (char *) __fix_to_virt(FIX_ACPI_END) + (phys_addr & ~PAGE_MASK);
    1.24 +	return (char *) __fix_to_virt(FIX_ACPI_END) + (phys_addr & ~PAGE_MASK);
    1.25  }
    1.26 +
    1.27  #else
    1.28  #ifdef	CONFIG_X86_64
    1.29  
    1.30 @@ -523,7 +524,7 @@ acpi_scan_rsdp (
    1.31  {
    1.32  	unsigned long		offset = 0;
    1.33  	unsigned long		sig_len = sizeof("RSD PTR ") - 1;
    1.34 -        unsigned long           vstart = isa_bus_to_virt(start);
    1.35 +	unsigned long		vstart = isa_bus_to_virt(start);
    1.36  
    1.37  	/*
    1.38  	 * Scan all 16-byte boundaries of the physical memory region for the
    1.39 @@ -649,7 +650,6 @@ acpi_find_rsdp (void)
    1.40  		else if (efi.acpi)
    1.41  			return __pa(efi.acpi);
    1.42  	}
    1.43 -
    1.44  	/*
    1.45  	 * Scan memory looking for the RSDP signature. First search EBDA (low
    1.46  	 * memory) paragraphs and then search upper memory (E0000-FFFFF).
    1.47 @@ -658,7 +658,7 @@ acpi_find_rsdp (void)
    1.48  	if (!rsdp_phys)
    1.49  		rsdp_phys = acpi_scan_rsdp (0xE0000, 0x20000);
    1.50  
    1.51 -        __set_fixmap_ma(FIX_ACPI_RSDP_PAGE, rsdp_phys, PAGE_KERNEL);
    1.52 +	__set_fixmap_ma(FIX_ACPI_RSDP_PAGE, rsdp_phys, PAGE_KERNEL);
    1.53  
    1.54  	return rsdp_phys;
    1.55  }
    1.56 @@ -674,7 +674,7 @@ acpi_parse_madt_lapic_entries(void)
    1.57  	int count;
    1.58  
    1.59  #ifdef CONFIG_XEN
    1.60 -        return 0;
    1.61 +	return 0;
    1.62  #endif
    1.63  
    1.64  	/* 
    1.65 @@ -872,7 +872,9 @@ acpi_boot_table_init(void)
    1.66  	}
    1.67  
    1.68  #ifdef __i386__
    1.69 -	//check_acpi_pci();
    1.70 +#ifndef CONFIG_XEN
    1.71 +	check_acpi_pci();
    1.72 +#endif
    1.73  #endif
    1.74  
    1.75  	acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);

     2.1 --- a/linux-2.6.11-xen-sparse/drivers/acpi/tables.c	Wed May 04 19:53:11 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/drivers/acpi/tables.c	Wed May 04 20:08:16 2005 +0000
     2.3 @@ -581,8 +581,8 @@ acpi_table_init (void)
     2.4  		return -ENODEV;
     2.5  	}
     2.6  
     2.7 -        rsdp = (struct acpi_table_rsdp *) (__fix_to_virt(FIX_ACPI_RSDP_PAGE)
     2.8 -                                           + (rsdp_phys & ~PAGE_MASK));
     2.9 +	rsdp = (struct acpi_table_rsdp *) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) +
    2.10 +					   (rsdp_phys & ~PAGE_MASK));
    2.11  	if (!rsdp) {
    2.12  		printk(KERN_WARNING PREFIX "Unable to map RSDP\n");
    2.13  		return -ENODEV;

     3.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h	Wed May 04 19:53:11 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h	Wed May 04 20:08:16 2005 +0000
     3.3 @@ -80,7 +80,7 @@ enum fixed_addresses {
     3.4  #ifdef CONFIG_ACPI_BOOT
     3.5  	FIX_ACPI_BEGIN,
     3.6  	FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
     3.7 -        FIX_ACPI_RSDP_PAGE,
     3.8 +	FIX_ACPI_RSDP_PAGE,
     3.9  #endif
    3.10  #ifdef CONFIG_PCI_MMCONFIG
    3.11  	FIX_PCIE_MCFG,

     4.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/io_apic.h	Wed May 04 19:53:11 2005 +0000
     4.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/io_apic.h	Wed May 04 20:08:16 2005 +0000
     4.3 @@ -165,28 +165,27 @@ extern int mpc_default_type;
     4.4  
     4.5  static inline unsigned int io_apic_read(unsigned int apic, unsigned int reg)
     4.6  {
     4.7 -        physdev_op_t op;
     4.8 -        int ret;
     4.9 +	physdev_op_t op;
    4.10 +	int ret;
    4.11  
    4.12 -        op.cmd = PHYSDEVOP_APIC_READ;
    4.13 -        op.u.apic_op.apic = apic;
    4.14 -        op.u.apic_op.offset = reg;
    4.15 -        ret = HYPERVISOR_physdev_op(&op);
    4.16 -        if (ret)
    4.17 -                return ret;
    4.18 -        return op.u.apic_op.value;
    4.19 +	op.cmd = PHYSDEVOP_APIC_READ;
    4.20 +	op.u.apic_op.apic = apic;
    4.21 +	op.u.apic_op.offset = reg;
    4.22 +	ret = HYPERVISOR_physdev_op(&op);
    4.23 +	if (ret)
    4.24 +		return ret;
    4.25 +	return op.u.apic_op.value;
    4.26  }
    4.27  
    4.28  static inline void io_apic_write(unsigned int apic, unsigned int reg, unsigned int value)
    4.29  {
    4.30 -        physdev_op_t op;
    4.31 -        int ret;
    4.32 +	physdev_op_t op;
    4.33  
    4.34 -        op.cmd = PHYSDEVOP_APIC_WRITE;
    4.35 -        op.u.apic_op.apic = apic;
    4.36 -        op.u.apic_op.offset = reg;
    4.37 -        op.u.apic_op.value = value;
    4.38 -        ret = HYPERVISOR_physdev_op(&op);
    4.39 +	op.cmd = PHYSDEVOP_APIC_WRITE;
    4.40 +	op.u.apic_op.apic = apic;
    4.41 +	op.u.apic_op.offset = reg;
    4.42 +	op.u.apic_op.value = value;
    4.43 +	HYPERVISOR_physdev_op(&op);
    4.44  }
    4.45  
    4.46  /*