> > Index: linux-2.6/arch/alpha/Kconfig > =================================================================== > --- linux-2.6.orig/arch/alpha/Kconfig > +++ linux-2.6/arch/alpha/Kconfig > @@ -66,6 +66,9 @@ config ZONE_DMA > config ARCH_DMA_ADDR_T_64BIT > def_bool y > > +config ARCH_PCI_BUS_ADDR_T_64BIT > + def_bool y > + For alpha you define a new symbol with a default value. > config NEED_DMA_MAP_STATE > def_bool y > > Index: linux-2.6/arch/arm/Kconfig > =================================================================== > --- linux-2.6.orig/arch/arm/Kconfig > +++ linux-2.6/arch/arm/Kconfig > @@ -1779,6 +1779,7 @@ config XEN > depends on !GENERIC_ATOMIC64 > depends on MMU > select ARCH_DMA_ADDR_T_64BIT > + select ARCH_PCI_BUS_ADDR_T_64BIT > select ARM_PSCI > select SWIOTLB_XEN > help For arm you use select ... As the actual definition of the Kconfig symbol is already present in mm/Kconfig please use select in all cases. > Index: linux-2.6/arch/arm/mm/Kconfig > =================================================================== > --- linux-2.6.orig/arch/arm/mm/Kconfig > +++ linux-2.6/arch/arm/mm/Kconfig > @@ -630,6 +630,9 @@ config ARCH_PHYS_ADDR_T_64BIT > config ARCH_DMA_ADDR_T_64BIT > bool > > +config ARCH_PCI_BUS_ADDR_T_64BIT > + bool > + Here it would have been nice with a comment that explains the use of ths symbol. > config ARM_THUMB > bool "Support Thumb user binaries" if !CPU_THUMBONLY > depends on CPU_ARM720T || CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || \ > Index: linux-2.6/arch/arm64/Kconfig > =================================================================== > --- linux-2.6.orig/arch/arm64/Kconfig > +++ linux-2.6/arch/arm64/Kconfig > @@ -125,6 +125,9 @@ config HAVE_GENERIC_RCU_GUP > config ARCH_DMA_ADDR_T_64BIT > def_bool y > > +config ARCH_PCI_BUS_ADDR_T_64BIT > + def_bool y > + Use select > config NEED_DMA_MAP_STATE > def_bool y > > Index: linux-2.6/arch/ia64/Kconfig > =================================================================== > --- linux-2.6.orig/arch/ia64/Kconfig > +++ linux-2.6/arch/ia64/Kconfig > @@ -74,6 +74,9 @@ config MMU > config ARCH_DMA_ADDR_T_64BIT > def_bool y > > +config ARCH_PCI_BUS_ADDR_T_64BIT > + def_bool y > + Use select > config NEED_DMA_MAP_STATE > def_bool y > > Index: linux-2.6/arch/mips/Kconfig > =================================================================== > --- linux-2.6.orig/arch/mips/Kconfig > +++ linux-2.6/arch/mips/Kconfig > @@ -984,6 +984,9 @@ config FW_CFE > config ARCH_DMA_ADDR_T_64BIT > def_bool (HIGHMEM && ARCH_PHYS_ADDR_T_64BIT) || 64BIT > > +config ARCH_PCI_BUS_ADDR_T_64BIT > + def_bool (HIGHMEM && ARCH_PHYS_ADDR_T_64BIT) || 64BIT Use select ... if > =================================================================== > --- linux-2.6.orig/arch/powerpc/Kconfig > +++ linux-2.6/arch/powerpc/Kconfig > @@ -23,6 +23,9 @@ config ARCH_PHYS_ADDR_T_64BIT > config ARCH_DMA_ADDR_T_64BIT > def_bool ARCH_PHYS_ADDR_T_64BIT > > +config ARCH_PCI_ADDR_T_64BIT > + def_bool ARCH_PHYS_ADDR_T_64BIT > + Use select > Index: linux-2.6/arch/sparc/Kconfig > =================================================================== > --- linux-2.6.orig/arch/sparc/Kconfig > +++ linux-2.6/arch/sparc/Kconfig > @@ -143,6 +143,9 @@ config GENERIC_ISA_DMA > bool > default y if SPARC32 > > +config ARCH_PCI_BUS_ADDR_T_64BIT > + def_bool y if SPARC64 > + Use select ... > config ARCH_SUPPORTS_DEBUG_PAGEALLOC > def_bool y if SPARC64 > > Index: linux-2.6/arch/tile/Kconfig > =================================================================== > --- linux-2.6.orig/arch/tile/Kconfig > +++ linux-2.6/arch/tile/Kconfig > @@ -86,6 +86,9 @@ config ARCH_PHYS_ADDR_T_64BIT > config ARCH_DMA_ADDR_T_64BIT > def_bool y > > +config ARCH_PCI_BUS_ADDR_T_64BIT > + def_bool y > + Use select ... > Index: linux-2.6/arch/x86/Kconfig > =================================================================== > --- linux-2.6.orig/arch/x86/Kconfig > +++ linux-2.6/arch/x86/Kconfig > @@ -1295,6 +1295,10 @@ config ARCH_DMA_ADDR_T_64BIT > def_bool y > depends on X86_64 || HIGHMEM64G > > +config ARCH_PCI_BUS_ADDR_T_64BIT > + def_bool y > + depends on X86_64 || HIGHMEM64G Use select ... > + > config X86_DIRECT_GBPAGES > def_bool y > depends on X86_64 && !DEBUG_PAGEALLOC && !KMEMCHECK > Index: linux-2.6/include/linux/types.h > =================================================================== > --- linux-2.6.orig/include/linux/types.h > +++ linux-2.6/include/linux/types.h > @@ -146,6 +146,13 @@ typedef u64 dma_addr_t; > typedef u32 dma_addr_t; > #endif /* dma_addr_t */ > > +/* A pci_bus_addr_t can hold pci bus address for the platform */ > +#ifdef CONFIG_ARCH_PCI_BUS_ADDR_T_64BIT > +typedef u64 pci_bus_addr_t; > +#else > +typedef u32 pci_bus_addr_t; > +#endif /* pci_bus_addr_t */ > + Looking att all the Kconfig logic I get the impression that the type of pci_bus_addr_t equals unsigned long. If this is correct then you can skip that and things gets much simpler. Sam -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
