From: Miklos Szeredi <miklos@szeredi.hu>
To: akpm@linux-foundation.org, torvalds@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, fujita.tomonori@lab.ntt.co.jp,
jdike@addtoit.com
Subject: [PATCH] uml: fix compile error in dma_get_cache_alignment()
Date: Thu, 12 Aug 2010 11:04:35 +0200 [thread overview]
Message-ID: <E1OjTiF-0001KI-Rx@pomaz-ex.szeredi.hu> (raw)
From: Miklos Szeredi <mszeredi@suse.cz>
Fix uml compile error:
include/linux/dma-mapping.h:145: error: redefinition of 'dma_get_cache_alignment'
/store/git/linux-2.6/arch/um/include/asm/dma-mapping.h:99: note: previous definition of 'dma_get_cache_alignment' was here
Introduced by this commit:
commit 4565f0170dfc849b3629c27d769db800467baa62
Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue Aug 10 18:03:22 2010 -0700
dma-mapping: unify dma_get_cache_alignment implementations
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---
arch/um/include/asm/dma-mapping.h | 7 -------
1 file changed, 7 deletions(-)
Index: linux-2.6/arch/um/include/asm/dma-mapping.h
===================================================================
--- linux-2.6.orig/arch/um/include/asm/dma-mapping.h 2010-08-12 09:32:16.000000000 +0200
+++ linux-2.6/arch/um/include/asm/dma-mapping.h 2010-08-12 10:14:12.000000000 +0200
@@ -95,13 +95,6 @@ dma_sync_sg_for_cpu(struct device *dev,
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
-static inline int
-dma_get_cache_alignment(void)
-{
- BUG();
- return(0);
-}
-
static inline void
dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
next reply other threads:[~2010-08-12 9:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-12 9:04 Miklos Szeredi [this message]
2010-08-13 7: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=E1OjTiF-0001KI-Rx@pomaz-ex.szeredi.hu \
--to=miklos@szeredi.hu \
--cc=akpm@linux-foundation.org \
--cc=fujita.tomonori@lab.ntt.co.jp \
--cc=jdike@addtoit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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®