浏览代码

xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD

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.

Cc: stable@vger.kernel.org
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Max Filippov 8 年之前
父节点
当前提交
4ab18701c6
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      arch/xtensa/kernel/setup.c

+ 2 - 2
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);
 __tagtable(BP_TAG_INITRD, parse_tag_initrd);
 
 
+#endif /* CONFIG_BLK_DEV_INITRD */
+
 #ifdef CONFIG_OF
 #ifdef CONFIG_OF
 
 
 static int __init parse_tag_fdt(const bp_tag_t *tag)
 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_OF */
 
 
-#endif /* CONFIG_BLK_DEV_INITRD */
-
 static int __init parse_tag_cmdline(const bp_tag_t* tag)
 static int __init parse_tag_cmdline(const bp_tag_t* tag)
 {
 {
 	strlcpy(command_line, (char *)(tag->data), COMMAND_LINE_SIZE);
 	strlcpy(command_line, (char *)(tag->data), COMMAND_LINE_SIZE);