diff for duplicates of <1570515913-26251-1-git-send-email-guoren@kernel.org> diff --git a/a/1.txt b/N1/1.txt index b2a210c..b69e26b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,12 +16,12 @@ index 23ee604..a00f8a0 100644 +++ b/arch/csky/kernel/setup.c @@ -47,9 +47,6 @@ static void __init csky_memblock_init(void) signed long size; - + memblock_reserve(__pa(_stext), _end - _stext); -#ifdef CONFIG_BLK_DEV_INITRD - memblock_reserve(__pa(initrd_start), initrd_end - initrd_start); -#endif - + early_init_fdt_reserve_self(); early_init_fdt_scan_reserved_mem(); diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c @@ -31,7 +31,7 @@ index d4c2292..48f791d 100644 @@ -35,6 +35,45 @@ unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss; EXPORT_SYMBOL(empty_zero_page); - + +#ifdef CONFIG_BLK_DEV_INITRD +static void __init setup_initrd(void) +{ @@ -85,6 +85,6 @@ index d4c2292..48f791d 100644 + mem_init_print_info(NULL); } - + -- 2.7.4 diff --git a/a/content_digest b/N1/content_digest index 2813dad..d311633 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -30,12 +30,12 @@ "+++ b/arch/csky/kernel/setup.c\n" "@@ -47,9 +47,6 @@ static void __init csky_memblock_init(void)\n" " \tsigned long size;\n" - " \n" + "\n" " \tmemblock_reserve(__pa(_stext), _end - _stext);\n" "-#ifdef CONFIG_BLK_DEV_INITRD\n" "-\tmemblock_reserve(__pa(initrd_start), initrd_end - initrd_start);\n" "-#endif\n" - " \n" + "\n" " \tearly_init_fdt_reserve_self();\n" " \tearly_init_fdt_scan_reserved_mem();\n" "diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c\n" @@ -45,7 +45,7 @@ "@@ -35,6 +35,45 @@ unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]\n" " \t\t\t\t\t\t__page_aligned_bss;\n" " EXPORT_SYMBOL(empty_zero_page);\n" - " \n" + "\n" "+#ifdef CONFIG_BLK_DEV_INITRD\n" "+static void __init setup_initrd(void)\n" "+{\n" @@ -99,8 +99,8 @@ "+\n" " \tmem_init_print_info(NULL);\n" " }\n" - " \n" + "\n" "-- \n" 2.7.4 -92e6a2bb596d74bcbcb2690c9c338405cd2d33e43cb0d8cf7a7b91924af8d4d1 +a70c4f5f752682d5cbb617993849f736ce42cdd2512ed27c3bdacc4d30ba66c8
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox