diff options
| author | Ben Peddell <klightspeed@killerwolves.net> | 2014-01-13 23:25:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-01-28 14:34:23 +0000 |
| commit | 4c235cb9e35407bdb4a2debeef4dc8721e8f91f2 (patch) | |
| tree | 15b0b511a1a8d5d74d17c22c0942359d40a2c307 /fs/binfmt_em86.c | |
| parent | 2ab4e8c06dc084c1bba8c8edfa1b33424c16d336 (diff) | |
| download | linux-stable-4c235cb9e35407bdb4a2debeef4dc8721e8f91f2.tar.gz linux-stable-4c235cb9e35407bdb4a2debeef4dc8721e8f91f2.tar.bz2 linux-stable-4c235cb9e35407bdb4a2debeef4dc8721e8f91f2.zip | |
ARM: 7941/2: Fix incorrect FDT initrd parameter override
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>
Diffstat (limited to 'fs/binfmt_em86.c')
0 files changed, 0 insertions, 0 deletions