The patch titled pci-dma: parisc: use include/linux/pci-dma.h has been removed from the -mm tree. Its filename was pci-dma-parisc-use-include-linux-pci-dmah.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: pci-dma: parisc: use include/linux/pci-dma.h From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Acked-by: Kyle McMartin <kyle@xxxxxxxxxxx> Cc: Helge Deller <deller@xxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxx> Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/parisc/Kconfig | 3 +++ arch/parisc/include/asm/pci.h | 14 +------------- 2 files changed, 4 insertions(+), 13 deletions(-) diff -puN arch/parisc/Kconfig~pci-dma-parisc-use-include-linux-pci-dmah arch/parisc/Kconfig --- a/arch/parisc/Kconfig~pci-dma-parisc-use-include-linux-pci-dmah +++ a/arch/parisc/Kconfig @@ -95,6 +95,9 @@ config PM config STACKTRACE_SUPPORT def_bool y +config NEED_DMA_MAP_STATE + def_bool y + config ISA_DMA_API bool diff -puN arch/parisc/include/asm/pci.h~pci-dma-parisc-use-include-linux-pci-dmah arch/parisc/include/asm/pci.h --- a/arch/parisc/include/asm/pci.h~pci-dma-parisc-use-include-linux-pci-dmah +++ a/arch/parisc/include/asm/pci.h @@ -183,19 +183,7 @@ struct pci_bios_ops { void (*fixup_bus)(struct pci_bus *bus); }; -/* pci_unmap_{single,page} is not a nop, thus... */ -#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)) +#include <linux/pci-dma.h> /* ** Stuff declared in arch/parisc/kernel/pci.c _ Patches currently in -mm which might be from fujita.tomonori@xxxxxxxxxxxxx are origin.patch linux-next.patch scsi-add-__init-__exit-macros-to-ibmvstgtc.patch ssb-add-dma_dev-to-ssb_device-structure.patch b43legacy-replace-the-ssb_dma-api-with-the-generic-dma-api.patch b43-replace-the-ssb_dma-api-with-the-generic-dma-api.patch b44-replace-the-ssb_dma-api-with-the-generic-dma-api.patch ssb-remove-the-ssb-dma-api.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html