diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 17:36:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 17:36:21 -0700 |
commit | 6bb597507f9839b13498781e481f5458aea33620 (patch) | |
tree | 33e6cbc66736e221217356c7120465be10dbaa1e /arch/x86/include/asm/pci_64.h | |
parent | 09f38dc19deba9eae1d668dde8bdd2aaed3479ed (diff) | |
parent | c5c67c7cba6a652d1c62dce45b0c130e5cb2a802 (diff) | |
download | linux-6bb597507f9839b13498781e481f5458aea33620.tar.bz2 |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mtrr: remove debug message
x86: disable stack-protector for __restore_processor_state()
x86: fix is_io_mapping_possible() build warning on i386 allnoconfig
x86, setup: compile with -DDISABLE_BRANCH_PROFILING
x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros
x86, mm: fix misuse of debug_kmap_atomic
x86: remove duplicated code with pcpu_need_numa()
x86,percpu: fix inverted NUMA test in setup_pcpu_remap()
x86: signal: check sas_ss_size instead of sas_ss_flags()
Diffstat (limited to 'arch/x86/include/asm/pci_64.h')
-rw-r--r-- | arch/x86/include/asm/pci_64.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/x86/include/asm/pci_64.h b/arch/x86/include/asm/pci_64.h index 4da207982777..ae5e40f67daf 100644 --- a/arch/x86/include/asm/pci_64.h +++ b/arch/x86/include/asm/pci_64.h @@ -24,28 +24,6 @@ extern int (*pci_config_write)(int seg, int bus, int dev, int fn, extern void dma32_reserve_bootmem(void); -/* The PCI address space does equal the physical memory - * address space. The networking and block device layers use - * this boolean for bounce buffer decisions - * - * On AMD64 it mostly equals, but we set it to zero if a hardware - * IOMMU (gart) of sotware IOMMU (swiotlb) is available. - */ -#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) - -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \ - dma_addr_t ADDR_NAME; -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \ - __u32 LEN_NAME; -#define pci_unmap_addr(PTR, ADDR_NAME) \ - ((PTR)->ADDR_NAME) -#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \ - (((PTR)->ADDR_NAME) = (VAL)) -#define pci_unmap_len(PTR, LEN_NAME) \ - ((PTR)->LEN_NAME) -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \ - (((PTR)->LEN_NAME) = (VAL)) - #endif /* __KERNEL__ */ #endif /* _ASM_X86_PCI_64_H */ |