Commit b05814a7 authored Jan 03, 2017 by Max Filippov Committed by Greg Kroah-Hartman Apr 18, 2017

xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD



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>

parent abf22f56

arch/xtensa/kernel/setup.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -133,6 +133,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag)

		__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);