Patch "xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD" has been added to the 4.9-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xtensa-move-parse_tag_fdt-out-of-ifdef-config_blk_dev_initrd.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
4ab18701c66552944188dbcd0ce0012729baab84Mon Sep 17 00:00:00 2001
From: Max Filippov <[email protected]>
Date: Tue, 3 Jan 2017 09:37:34 -0800
Subject: xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD
From: Max Filippov <[email protected]>
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.
--- arch/xtensa/kernel/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/xtensa/kernel/setup.c +2 -2
@@ -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 );
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/xtensa-move-parse_tag_fdt-out-of-ifdef-config_blk_dev_initrd.patch