From: e@lab.ntt.co.jp
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, fujita.tomonori@lab.ntt.co.jp, x86@kernel.org
Subject: [PATCH -mm 02/12] x86: use asm-generic/pci-dma-common.h
Date: Tue, 9 Feb 2010 22:35:14 +0900 [thread overview]
Message-ID: <1265722524-9493-3-git-send-email-e> (raw)
In-Reply-To: <1265722524-9493-1-git-send-email-e>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: x86@kernel.org
---
arch/x86/include/asm/pci.h | 27 ++-------------------------
1 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index ada8c20..441e94a 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -91,32 +91,9 @@ extern void pci_iommu_alloc(void);
#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
#if defined(CONFIG_X86_64) || defined(CONFIG_DMAR) || defined(CONFIG_DMA_API_DEBUG)
-
-#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) dma_addr_t ADDR_NAME[0];
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) unsigned LEN_NAME[0];
-#define pci_unmap_addr(PTR, ADDR_NAME) sizeof((PTR)->ADDR_NAME)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
- do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))
-#define pci_unmap_len(PTR, LEN_NAME) sizeof((PTR)->LEN_NAME)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
- do { break; } while (pci_unmap_len(PTR, LEN_NAME))
-
+#define HAVE_ARCH_PCI_UNMAP
#endif
+#include <asm-generic/pci-dma-common.h>
#endif /* __KERNEL__ */
--
1.5.6.5
next prev parent reply other threads:[~2010-02-09 14:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-09 13:35 [PATCH -mm 00/12] adds include/asm-generic/pci-dma-common.h e
2010-02-09 13:35 ` [PATCH -mm 01/12] " e
2010-02-09 13:35 ` e [this message]
2010-02-09 13:35 ` [PATCH -mm 03/12] alpha: use asm-generic/pci-dma-common.h e
2010-02-09 13:35 ` [PATCH -mm 04/12] arm: " e
2010-02-09 13:35 ` [PATCH -mm 05/12] frv: " e
2010-02-09 13:35 ` [PATCH -mm 06/12] ia64: " e
2010-02-09 13:35 ` [PATCH -mm 07/12] mips: " e
2010-02-09 13:35 ` [PATCH -mm 08/12] parisc: " e
2010-02-09 13:35 ` [PATCH -mm 09/12] powerpc: " e
2010-02-09 13:35 ` [PATCH -mm 10/12] sh: " e
2010-02-09 13:35 ` [PATCH -mm 11/12] sparc: " e
2010-02-09 19:26 ` David Miller
2010-02-09 13:35 ` [PATCH -mm 12/12] xtensa: " e
2010-02-09 15:23 ` [PATCH -mm 00/12] adds include/asm-generic/pci-dma-common.h Arnd Bergmann
2010-02-10 0:06 ` FUJITA Tomonori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1265722524-9493-3-git-send-email-e \
--to=e@lab.ntt.co.jp \
--cc=akpm@linux-foundation.org \
--cc=fujita.tomonori@lab.ntt.co.jp \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®