ia64/xen-unstable

changeset 4775:25570fbe05c7

bitkeeper revision 1.1389.5.17 (427a2e3dMxo6jmtcFafKR_cMZizuvw)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean
author cl349@firebug.cl.cam.ac.uk[cl349]
date Thu May 05 14:31:25 2005 +0000 (2005-05-05)
parents e2c5e62c7c0d eadf34921bc5
children 1fb7681bfe10
files linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig	Thu May 05 14:27:20 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig	Thu May 05 14:31:25 2005 +0000
     1.3 @@ -788,7 +788,7 @@ config PCI_MMCONFIG
     1.4  	bool
     1.5  	depends on PCI && (PCI_GOMMCONFIG || (PCI_GOANY && ACPI))
     1.6  	select ACPI_BOOT
     1.7 -	default n
     1.8 +	default y
     1.9  
    1.10  source "drivers/pci/pcie/Kconfig"
    1.11  
     2.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h	Thu May 05 14:27:20 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h	Thu May 05 14:31:25 2005 +0000
     2.3 @@ -117,7 +117,7 @@ extern void __set_fixmap_ma (enum fixed_
     2.4   * Some hardware wants to get fixmapped without caching.
     2.5   */
     2.6  #define set_fixmap_nocache(idx, phys) \
     2.7 -		__set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
     2.8 +		__set_fixmap_ma(idx, phys, PAGE_KERNEL_NOCACHE)
     2.9  
    2.10  #define clear_fixmap(idx) \
    2.11  		__set_fixmap(idx, 0, __pgprot(0))
     3.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h	Thu May 05 14:27:20 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h	Thu May 05 14:31:25 2005 +0000
     3.3 @@ -75,7 +75,7 @@ extern void __set_fixmap_ma (enum fixed_
     3.4   * Some hardware wants to get fixmapped without caching.
     3.5   */
     3.6  #define set_fixmap_nocache(idx, phys) \
     3.7 -		__set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
     3.8 +		__set_fixmap_ma(idx, phys, PAGE_KERNEL_NOCACHE)
     3.9  
    3.10  #define clear_fixmap(idx) \
    3.11                  __set_fixmap(idx, 0, __pgprot(0))