ARM: 7941/2: Fix incorrect FDT initrd parameter override
authorBen Peddell <klightspeed@killerwolves.net>
Mon, 13 Jan 2014 22:25:18 +0000 (23:25 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 31 Mar 2014 17:05:15 +0000 (10:05 -0700)
commit9c050c7fa1603f8e3010918f8204cd69cec4fd94
treedf23b82b53b3d6ed3daa98f6a9d31259069dc50a
parentc777c885da2ef7afee1e0e6d3da70bda74df3e97
ARM: 7941/2: Fix incorrect FDT initrd parameter override

commit 4c235cb9e35407bdb4a2debeef4dc8721e8f91f2 upstream.

Commit 65939301acdb (arm: set initrd_start/initrd_end for fdt scan)
caused the FDT initrd_start and initrd_end to override the
phys_initrd_start and phys_initrd_size set by the initrd= kernel
parameter.  With this patch initrd_start and initrd_end will be
overridden if phys_initrd_start and phys_initrd_size are set by the
kernel initrd= parameter.

Fixes: 65939301acdb (arm: set initrd_start/initrd_end for fdt scan)
Signed-off-by: Ben Peddell <klightspeed@killerwolves.net>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/mm/init.c