diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-20 21:20:11 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-20 21:20:11 +0800 |
| commit | 9b17ba5e21b99587d7c54250059cf10fd51c74f2 (patch) | |
| tree | cea45b7f36f3dc50bb8039e9ac4de1d070520a7d | |
| parent | 4c88271f57519108a32181ba7aa600becf85729c (diff) | |
| parent | d67f9e043c24cd8017f52c3514472da7073b8c62 (diff) | |
Merge branch 'v4.1/topic/KASAN' into linux-linaro-lsk-v4.1
| -rw-r--r-- | arch/arm64/kernel/setup.c | 2 | ||||
| -rw-r--r-- | mm/early_ioremap.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 668931813113..44b56ebc7767 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -392,6 +392,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), diff --git a/mm/early_ioremap.c b/mm/early_ioremap.c index a0baeb4be934..d0d7cdbfb69f 100644 --- a/mm/early_ioremap.c +++ b/mm/early_ioremap.c @@ -15,6 +15,7 @@ #include <linux/mm.h> #include <linux/vmalloc.h> #include <asm/fixmap.h> +#include <asm/early_ioremap.h> #ifdef CONFIG_MMU static int early_ioremap_debug __initdata; |