ia64/xen-unstable

changeset 4955:85f5f11a202e

bitkeeper revision 1.1431 (4289efbdWNFcwk1K55QB4D7PHgWQVQ)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Tue May 17 13:21:01 2005 +0000 (2005-05-17)
parents 939209814d75 09082591e3b7
children cc1c80ec8139
files linux-2.6.11-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/acpi/boot.c	Tue May 17 13:20:17 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/acpi/boot.c	Tue May 17 13:21:01 2005 +0000
     1.3 @@ -105,23 +105,7 @@ EXPORT_SYMBOL(x86_acpiid_to_apicid);
     1.4   */
     1.5  enum acpi_irq_model_id		acpi_irq_model = ACPI_IRQ_MODEL_PIC;
     1.6  
     1.7 -#ifdef CONFIG_XEN
     1.8 -
     1.9 -char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
    1.10 -{
    1.11 -	unsigned int i,j;
    1.12 -
    1.13 -	j = PAGE_ALIGN(size) >> PAGE_SHIFT;
    1.14 -	for (i = 0; (i < FIX_ACPI_PAGES) && j ; i++, j--) {
    1.15 -		set_fixmap(FIX_ACPI_END - i,
    1.16 -			   (phys_addr & PAGE_MASK) + (i << PAGE_SHIFT));
    1.17 -	}
    1.18 -
    1.19 -	return (char *) __fix_to_virt(FIX_ACPI_END) + (phys_addr & ~PAGE_MASK);
    1.20 -}
    1.21 -
    1.22 -#else
    1.23 -#ifdef	CONFIG_X86_64
    1.24 +#if defined(CONFIG_X86_64) && !defined(CONFIG_XEN)
    1.25  
    1.26  /* rely on all ACPI tables being in the direct mapping */
    1.27  char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
    1.28 @@ -154,8 +138,10 @@ char *__acpi_map_table(unsigned long phy
    1.29  	unsigned long base, offset, mapped_size;
    1.30  	int idx;
    1.31  
    1.32 +#ifndef CONFIG_XEN
    1.33  	if (phys + size < 8*1024*1024) 
    1.34  		return __va(phys); 
    1.35 +#endif
    1.36  
    1.37  	offset = phys & (PAGE_SIZE - 1);
    1.38  	mapped_size = PAGE_SIZE - offset;
    1.39 @@ -177,7 +163,6 @@ char *__acpi_map_table(unsigned long phy
    1.40  	return ((unsigned char *) base + offset);
    1.41  }
    1.42  #endif
    1.43 -#endif /* CONFIG_XEN */
    1.44  
    1.45  #ifdef CONFIG_PCI_MMCONFIG
    1.46  static int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)