public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Russell King <linux@arm.linux.org.uk>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: DMA: Add missing semicolon for the define of dma_alloc_area
Date: Fri, 01 Jul 2011 16:37:52 +0800	[thread overview]
Message-ID: <1309509472.30642.1.camel@phoenix> (raw)

I got below build error by: make at91x40_defconfig;make
Fix it by adding a missing semicolon for the define of dma_alloc_area.

  CC      arch/arm/mm/dma-mapping.o
arch/arm/mm/dma-mapping.c:309: warning: 'struct dma_coherent_area' declared inside parameter list
arch/arm/mm/dma-mapping.c:309: warning: its scope is only this definition or declaration, which is probably not what you want
arch/arm/mm/dma-mapping.c: In function '__dma_alloc':
arch/arm/mm/dma-mapping.c:324: error: expected ';' before '}' token
arch/arm/mm/dma-mapping.c: At top level:
arch/arm/mm/dma-mapping.c:334: warning: 'struct dma_coherent_area' declared inside parameter list
arch/arm/mm/dma-mapping.c:374: warning: 'struct dma_coherent_area' declared inside parameter list
make[1]: *** [arch/arm/mm/dma-mapping.o] Error 1
make: *** [arch/arm/mm] Error 2

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 arch/arm/mm/dma-mapping.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 3ec2129..090690d 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -291,7 +291,7 @@ static void dma_free_area(void *cpu_addr, size_t size, struct dma_coherent_area
 
 #else	/* !CONFIG_MMU */
 
-#define dma_alloc_area(size, pfn, gfp, area)	({ *(pfn) = 0; NULL })
+#define dma_alloc_area(size, pfn, gfp, area)	({ *(pfn) = 0; NULL; })
 #define dma_free_area(addr, size, area)		do { } while (0)
 
 #define nommu()	(1)
-- 
1.7.4.1




             reply	other threads:[~2011-07-01  8:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-01  8:37 Axel Lin [this message]
2011-07-01 11:12 ` [PATCH] ARM: DMA: Add missing semicolon for the define of dma_alloc_area Sergei Shtylyov
2011-07-04  8:10   ` Axel Lin

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=1309509472.30642.1.camel@phoenix \
    --to=axel.lin@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    /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