lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.14 113/161] s390/eadm: fix CONFIG_BLOCK include dependency
    Date
    From: Sebastian Ott <sebott@linux.vnet.ibm.com>

    [ Upstream commit 366b77ae43c5a3bf1a367f15ec8bc16e05035f14 ]

    Commit 2a842acab109 ("block: introduce new block status code type")
    added blk_status_t usage to the eadm subchannel driver. However
    blk_status_t is unknown when included via <linux/blkdev.h> for CONFIG_BLOCK=n.

    Only include <linux/blk_types.h> since this is the only dependency eadm has.

    This fixes build failures like below:
    In file included from drivers/s390/cio/eadm_sch.c:24:0:
    ./arch/s390/include/asm/eadm.h:111:4: error: unknown type name 'blk_status_t'; did you mean 'si_status'?
    blk_status_t error);

    Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    arch/s390/include/asm/eadm.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/s390/include/asm/eadm.h b/arch/s390/include/asm/eadm.h
    index eb5323161f11..bb63b2afdf6f 100644
    --- a/arch/s390/include/asm/eadm.h
    +++ b/arch/s390/include/asm/eadm.h
    @@ -4,7 +4,7 @@

    #include <linux/types.h>
    #include <linux/device.h>
    -#include <linux/blkdev.h>
    +#include <linux/blk_types.h>

    struct arqb {
    u64 data;
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 05:03    [W:3.006 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site