mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mike Frysinger <vapier@gentoo.org>
To: linux-kernel@vger.kernel.org
Cc: uclinux-dist-devel@blackfin.uclinux.org
Subject: [PATCH 2/2] Blackfin: fix dma-mapping build errors
Date: Mon, 22 Jun 2009 21:54:46 -0400	[thread overview]
Message-ID: <1245722086-13340-2-git-send-email-vapier@gentoo.org> (raw)
In-Reply-To: <1245722086-13340-1-git-send-email-vapier@gentoo.org>

The recent deprecation of dma_sync_{sg,single} ironically broke Blackfin
systems.  This is because we don't define dma_sync_sg_for_cpu at all, so
until the DMA asm-generic conversion/cleanup is done after the next
release, simply redirect the dma_sync_sg_for_cpu to the debug version.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 arch/blackfin/include/asm/dma-mapping.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/blackfin/include/asm/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h
index d7d9148..257eb42 100644
--- a/arch/blackfin/include/asm/dma-mapping.h
+++ b/arch/blackfin/include/asm/dma-mapping.h
@@ -1,6 +1,7 @@
 #ifndef _BLACKFIN_DMA_MAPPING_H
 #define _BLACKFIN_DMA_MAPPING_H
 
+#include <linux/dma-debug.h>
 #include <asm/scatterlist.h>
 
 void dma_alloc_init(unsigned long start, unsigned long end);
@@ -95,4 +96,7 @@ static inline void dma_sync_single_for_device(struct device *dev,
 					enum dma_data_direction dir)
 {
 }
+
+#define dma_sync_sg_for_cpu debug_dma_sync_sg_for_cpu
+
 #endif				/* _BLACKFIN_DMA_MAPPING_H */
-- 
1.6.3.1


  reply	other threads:[~2009-06-23  1:55 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-23  1:54 [PATCH 1/2] Blackfin: hook up new perf_counter_open syscall Mike Frysinger
2009-06-23  1:54 ` Mike Frysinger [this message]
2009-06-23  2:14   ` [PATCH 2/2] Blackfin: fix dma-mapping build errors FUJITA Tomonori
2009-06-23  2:29     ` Mike Frysinger
2009-06-23  2:37       ` FUJITA Tomonori
2009-06-23  2:33     ` [PATCH 2/2 v2] " Mike Frysinger
2009-06-23  8:40       ` Arnd Bergmann
2009-06-23 11:09         ` Mike Frysinger
2009-06-23 13:07           ` Arnd Bergmann

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=1245722086-13340-2-git-send-email-vapier@gentoo.org \
    --to=vapier@gentoo.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=uclinux-dist-devel@blackfin.uclinux.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®