summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2018-11-06 01:54:27 +0300
committerRob Herring <robh@kernel.org>2018-11-27 00:50:02 +0300
commitb1ab95c63622e9d9bd0ce685e149034d393afc2e (patch)
tree35fd6535f0b8c6934fb86b86754d300c6d7898f8 /init
parentcd5e0fa0837c232f50a17390ce40a953c437a75f (diff)
downloadlinux-b1ab95c63622e9d9bd0ce685e149034d393afc2e.tar.xz
arch: Make phys_initrd_start and phys_initrd_size global variables
Make phys_initrd_start and phys_initrd_size global variables declared in init/do_mounts_initrd.c such that we can later have generic code in drivers/of/fdt.c populate those variables for us. This requires both the ARM and unicore32 implementations to be properly guarded against CONFIG_BLK_DEV_INITRD, and also initialize the variables to the expected default values (unicore32). Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Mike Rapoport <rppt@linux.ibm.com> Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts_initrd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index d1a5d885ce13..45865b72f4ea 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -16,6 +16,9 @@ int initrd_below_start_ok;
unsigned int real_root_dev; /* do_proc_dointvec cannot handle kdev_t */
static int __initdata mount_initrd = 1;
+phys_addr_t phys_initrd_start __initdata;
+unsigned long phys_initrd_size __initdata;
+
static int __init no_initrd(char *str)
{
mount_initrd = 0;