diff options
| author | Ingo Molnar | 2015-10-20 10:16:46 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-10-20 10:16:46 +0200 |
| commit | a1a2ab2ff7040bdc9a31bfe7173913971f7d723b (patch) | |
| tree | a5b448aaedafafca6974710b7d64074ed964fe24 /arch/arm64/kernel/setup.c | |
| parent | locking/rwsem: Use acquire/release semantics (diff) | |
| parent | Linux 4.3-rc6 (diff) | |
| download | kernel-qcow2-linux-a1a2ab2ff7040bdc9a31bfe7173913971f7d723b.tar.gz kernel-qcow2-linux-a1a2ab2ff7040bdc9a31bfe7173913971f7d723b.tar.xz kernel-qcow2-linux-a1a2ab2ff7040bdc9a31bfe7173913971f7d723b.zip | |
Merge tag 'v4.3-rc6' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/setup.c')
| -rw-r--r-- | arch/arm64/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 6bab21f84a9f..232247945b1c 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -364,6 +364,8 @@ static void __init relocate_initrd(void) to_free = ram_end - orig_start; size = orig_end - orig_start; + if (!size) + return; /* initrd needs to be relocated completely inside linear mapping */ new_start = memblock_find_in_range(0, PFN_PHYS(max_pfn), |