diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2017-01-03 09:37:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-18 07:55:49 +0200 |
| commit | b05814a7b4552d54cbb6e32cfc4beef35b9bbc52 (patch) | |
| tree | 6c2c6d85cd4660c322439d74b795d3ae2f20bd57 /arch | |
| parent | abf22f568aa653d958786a33971461e1c7444082 (diff) | |
| download | linux-stable-b05814a7b4552d54cbb6e32cfc4beef35b9bbc52.tar.gz linux-stable-b05814a7b4552d54cbb6e32cfc4beef35b9bbc52.tar.bz2 linux-stable-b05814a7b4552d54cbb6e32cfc4beef35b9bbc52.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/xtensa/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 06370ccea9e9..b70097e7f37a 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -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); |