[Xen-changelog] Fix installing fixmap_nocache entries, as used by PCI_MMCONFIG.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1436.2.1, 2005/05/05 15:29:20+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        Fix installing fixmap_nocache entries, as used by PCI_MMCONFIG.
        fixmap.h:
          Address passed to set_fixmap_nocache is a machine-address -- install
          it as such.
        Kconfig:
          Re-enable PCI_MMCONFIG.
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 arch/xen/i386/Kconfig               |    2 +-
 include/asm-xen/asm-i386/fixmap.h   |    2 +-
 include/asm-xen/asm-x86_64/fixmap.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig 
b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig     2005-05-05 14:04:40 
-04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig     2005-05-05 14:04:40 
-04:00
@@ -788,7 +788,7 @@
        bool
        depends on PCI && (PCI_GOMMCONFIG || (PCI_GOANY && ACPI))
        select ACPI_BOOT
-       default n
+       default y
 
 source "drivers/pci/pcie/Kconfig"
 
diff -Nru a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h 
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h 2005-05-05 
14:04:40 -04:00
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h 2005-05-05 
14:04:40 -04:00
@@ -117,7 +117,7 @@
  * Some hardware wants to get fixmapped without caching.
  */
 #define set_fixmap_nocache(idx, phys) \
-               __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
+               __set_fixmap_ma(idx, phys, PAGE_KERNEL_NOCACHE)
 
 #define clear_fixmap(idx) \
                __set_fixmap(idx, 0, __pgprot(0))
diff -Nru a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h 
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h       
2005-05-05 14:04:40 -04:00
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h       
2005-05-05 14:04:40 -04:00
@@ -75,7 +75,7 @@
  * Some hardware wants to get fixmapped without caching.
  */
 #define set_fixmap_nocache(idx, phys) \
-               __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
+               __set_fixmap_ma(idx, phys, PAGE_KERNEL_NOCACHE)
 
 #define clear_fixmap(idx) \
                 __set_fixmap(idx, 0, __pgprot(0))

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog