From cd3d3fe46db62df45a0d077caba64a7a930e7c60 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 10 Mar 2010 15:23:27 -0800 Subject: [PATCH] --- yaml --- r: 187279 b: refs/heads/master c: 5cabbb6277286adf973fbb30aca9b194922a316e h: refs/heads/master i: 187277: 160b740455a4379c913d4935e9feaae828b07222 187275: 68c58dddac1c4e58b5a46bb4e3cbd4a093972c21 187271: e2b66aa5758640ddaa524848318420444705b625 187263: 9811b995962abb5c402b3cc9cc57345ba1e78456 v: v3 --- [refs] | 2 +- trunk/arch/sh/Kconfig | 3 +++ trunk/arch/sh/include/asm/pci.h | 19 +------------------ 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 526773819771..94310e588c11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af407c6db16aa9ca63559076dbe620220a822580 +refs/heads/master: 5cabbb6277286adf973fbb30aca9b194922a316e diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index 05cef5061293..8d90564c2bcf 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/arch/sh/Kconfig @@ -183,6 +183,9 @@ config DMA_COHERENT config DMA_NONCOHERENT def_bool !DMA_COHERENT +config NEED_DMA_MAP_STATE + def_bool DMA_NONCOHERENT + source "init/Kconfig" source "kernel/Kconfig.freezer" diff --git a/trunk/arch/sh/include/asm/pci.h b/trunk/arch/sh/include/asm/pci.h index 1042f7f0a48b..991c2a424b24 100644 --- a/trunk/arch/sh/include/asm/pci.h +++ b/trunk/arch/sh/include/asm/pci.h @@ -83,24 +83,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) */ #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) -/* pci_unmap_{single,page} being a nop depends upon the - * configuration. - */ -#ifdef CONFIG_DMA_NONCOHERENT -#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)) -#else -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) -#define pci_unmap_addr(PTR, ADDR_NAME) (0) -#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) -#define pci_unmap_len(PTR, LEN_NAME) (0) -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) -#endif +#include #ifdef CONFIG_PCI /*