From 57739d8176c8ce0b522384bf2872dcaf636dadc3 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 28 Oct 2002 15:58:26 +0000 Subject: [ARM] Miscellaneous fixes - Adjust PCI minimum offsets for footbridge architectures - Remove unnecessary - Add comment about {in,out}[bwl] - Remove obsolete 6th "flags" parameter to pci_pool_create --- include/asm-arm/arch-ebsa285/hardware.h | 4 ++-- include/asm-arm/io.h | 3 ++- include/asm-arm/pci.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'include/asm-arm') diff --git a/include/asm-arm/arch-ebsa285/hardware.h b/include/asm-arm/arch-ebsa285/hardware.h index 21157a5c3432..2ef2200f108c 100644 --- a/include/asm-arm/arch-ebsa285/hardware.h +++ b/include/asm-arm/arch-ebsa285/hardware.h @@ -133,7 +133,7 @@ extern void cpld_modify(int mask, int set); #define pcibios_assign_all_busses() 1 -#define PCIBIOS_MIN_IO 0x6000 -#define PCIBIOS_MIN_MEM 0x40000000 +#define PCIBIOS_MIN_IO 0x1000 +#define PCIBIOS_MIN_MEM 0x81000000 #endif diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index ebaef59d788a..11aa8ea1d9e2 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h @@ -22,7 +22,6 @@ #ifdef __KERNEL__ -#include #include #include #include @@ -94,6 +93,8 @@ extern void __readwrite_bug(const char *fn); * Note that we prevent GCC re-ordering or caching values in expressions * by introducing sequence points into the in*() definitions. Note that * __raw_* do not guarantee this behaviour. + * + * The {in,out}[bwl] macros are for emulating x86-style PCI/ISA IO space. */ #ifdef __io #define outb(v,p) __raw_writeb(v,__io(p)) diff --git a/include/asm-arm/pci.h b/include/asm-arm/pci.h index cd074e0daf51..aa08b2c39232 100644 --- a/include/asm-arm/pci.h +++ b/include/asm-arm/pci.h @@ -241,7 +241,7 @@ static inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask) /* kmem_cache style wrapper around pci_alloc_consistent() */ struct pci_pool *pci_pool_create (const char *name, struct pci_dev *dev, - size_t size, size_t align, size_t allocation, int flags); + size_t size, size_t align, size_t allocation); void pci_pool_destroy (struct pci_pool *pool); void *pci_pool_alloc (struct pci_pool *pool, int flags, dma_addr_t *handle); -- cgit v1.2.3