[lkml]   [2012]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH] Fix blkdev.h build errors when BLOCK=n
    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 <>
    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>

     \ /
      Last update: 2012-04-30 10:41    [W:0.022 / U:4.708 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site