lkml.org 
[lkml]   [2017]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 23/36] xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Max Filippov <jcmvbkbc@gmail.com>

    commit 4ab18701c66552944188dbcd0ce0012729baab84 upstream.

    FDT tag parsing is not related to whether BLK_DEV_INITRD is configured
    or not, move it out of the corresponding #ifdef/#endif block.
    This fixes passing external FDT to the kernel configured w/o
    BLK_DEV_INITRD support.

    Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/xtensa/kernel/setup.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/xtensa/kernel/setup.c
    +++ b/arch/xtensa/kernel/setup.c
    @@ -133,6 +133,8 @@ static int __init parse_tag_initrd(const

    __tagtable(BP_TAG_INITRD, parse_tag_initrd);

    +#endif /* CONFIG_BLK_DEV_INITRD */
    +
    #ifdef CONFIG_OF

    static int __init parse_tag_fdt(const bp_tag_t *tag)
    @@ -145,8 +147,6 @@ __tagtable(BP_TAG_FDT, parse_tag_fdt);

    #endif /* CONFIG_OF */

    -#endif /* CONFIG_BLK_DEV_INITRD */
    -
    static int __init parse_tag_cmdline(const bp_tag_t* tag)
    {
    strlcpy(command_line, (char *)(tag->data), COMMAND_LINE_SIZE);

    \
     
     \ /
      Last update: 2017-03-13 10:22    [W:4.085 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site