From: Russell King - ARM Linux <linux@arm.linux.org.uk>
To: linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Jens Axboe <axboe@kernel.dk>
Subject: Re: [PATCH] Fix blkdev.h build errors when BLOCK=n
Date: Sat, 12 May 2012 20:54:30 +0100 [thread overview]
Message-ID: <20120512195430.GA23863@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <20120430081834.GS24211@n2100.arm.linux.org.uk>
Ping.
On Mon, Apr 30, 2012 at 09:18:34AM +0100, Russell King - ARM Linux wrote:
> I see builds failing with:
>
> CC [M] drivers/mmc/host/dw_mmc.o
> In file included from drivers/mmc/host/dw_mmc.c:15:
> include/linux/blkdev.h:1404: warning: 'struct task_struct' declared inside parameter list
> include/linux/blkdev.h:1404: warning: its scope is only this definition or declaration, which is probably not what you want
> include/linux/blkdev.h:1408: warning: 'struct task_struct' declared inside parameter list
> include/linux/blkdev.h:1413: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'blk_needs_flush_plug'
> make[4]: *** [drivers/mmc/host/dw_mmc.o] Error 1
>
> This is because dw_mmc.c includes linux/blkdev.h as the very first file,
> and when CONFIG_BLOCK=n, blkdev.h omits all includes.
>
> As it requires linux/sched.h even when CONFIG_BLOCK=n, move this out of
> the #ifdef.
>
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> ---
> include/linux/blkdev.h | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index 2aa2466..4d4ac24 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -1,9 +1,10 @@
> #ifndef _LINUX_BLKDEV_H
> #define _LINUX_BLKDEV_H
>
> +#include <linux/sched.h>
> +
> #ifdef CONFIG_BLOCK
>
> -#include <linux/sched.h>
> #include <linux/major.h>
> #include <linux/genhd.h>
> #include <linux/list.h>
>
next prev parent reply other threads:[~2012-05-12 19:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-30 8:18 [PATCH] Fix blkdev.h build errors when BLOCK=n Russell King - ARM Linux
2012-05-12 19:54 ` Russell King - ARM Linux [this message]
2012-05-14 6:30 ` Jens Axboe
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=20120512195430.GA23863@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.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;
as well as URLs for NNTP newsgroup(s).