diff for duplicates of <20180919103457.GA20545@rapoport-lnx> diff --git a/a/1.txt b/N1/1.txt index 7dfce45..ffc6065 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,115 +15,3 @@ On Wed, Sep 19, 2018 at 10:04:49AM +0100, Jonathan Cameron wrote: > version of the mm tree. Can you please try the following patch: - - -From 079bd5d24a01df3df9500d0a33d89cb9f7da4588 Mon Sep 17 00:00:00 2001 -From: Mike Rapoport <rppt@linux.vnet.ibm.com> -Date: Wed, 19 Sep 2018 13:29:27 +0300 -Subject: [PATCH] of/fdt: fixup #ifdefs after removal of HAVE_MEMBLOCK config - option - -The removal of HAVE_MEMBLOCK configuration option, mistakenly dropped the -wrong #endif. This patch restores that #endif and removes the part that -should have been actually removed, starting from #else and up to the -correct #endif - -Reported-by: Jonathan Cameron <jonathan.cameron@huawei.com> -Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> ---- - drivers/of/fdt.c | 21 +-------------------- - 1 file changed, 1 insertion(+), 20 deletions(-) - -diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c -index 48314e9..bb532aa 100644 ---- a/drivers/of/fdt.c -+++ b/drivers/of/fdt.c -@@ -1119,6 +1119,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, - #endif - #ifndef MAX_MEMBLOCK_ADDR - #define MAX_MEMBLOCK_ADDR ((phys_addr_t)~0) -+#endif - - void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) - { -@@ -1175,26 +1176,6 @@ int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, - return memblock_reserve(base, size); - } - --#else --void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) --{ -- WARN_ON(1); --} -- --int __init __weak early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size) --{ -- return -ENOSYS; --} -- --int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, -- phys_addr_t size, bool nomap) --{ -- pr_err("Reserved memory not supported, ignoring range %pa - %pa%s\n", -- &base, &size, nomap ? " (nomap)" : ""); -- return -ENOSYS; --} --#endif -- - static void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) - { - return memblock_alloc(size, align); --- -2.7.4 - - -> > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c -> > index 76c83c1..bd841bb 100644 -> > --- a/drivers/of/fdt.c -> > +++ b/drivers/of/fdt.c -> > @@ -1115,13 +1115,11 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, -> > return 1; -> > } -> > -> > -#ifdef CONFIG_HAVE_MEMBLOCK -> > #ifndef MIN_MEMBLOCK_ADDR -> > #define MIN_MEMBLOCK_ADDR __pa(PAGE_OFFSET) -> > #endif -> > #ifndef MAX_MEMBLOCK_ADDR -> > #define MAX_MEMBLOCK_ADDR ((phys_addr_t)~0) -> > -#endif -> -> This isn't the right #endif. It is matching with the #ifndef MAX_MEMBLOCK_ADDR -> not the intented #ifdef CONFIG_HAVE_MEMBLOCK. -> -> Now I haven't chased through the exact reason this is causing my acpi -> arm64 system not to boot on the basis it is obviously miss-matched anyway -> and I'm inherently lazy. It's resulting in stubs replacing the following weak -> functions. -> -> early_init_dt_add_memory_arch -> (this is defined elsewhere for some architectures but not arm) -> -> early_init_dt_mark_hotplug_memory_arch -> (there is only one definition of this in the kernel so it doesn't -> need to be weak or in the header etc). -> -> early_init_dt_reserve_memory_arch -> (defined on mips but nothing else) -> -> Taking out the right endif also lets you drop an #else removing some stub -> functions further down in here. -> -> Nice cleanup in general btw. -> -> Thanks, -> -> Jonathan -> > -> > void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) -> > { -> - --- -Sincerely yours, -Mike. diff --git a/a/content_digest b/N1/content_digest index 598300d..6481911 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020180919100449.00006df9@huawei.com\0" "From\0Mike Rapoport <rppt@linux.vnet.ibm.com>\0" "Subject\0Re: [RFC PATCH 03/29] mm: remove CONFIG_HAVE_MEMBLOCK\0" - "Date\0Wed, 19 Sep 2018 10:34:57 +0000\0" + "Date\0Wed, 19 Sep 2018 13:34:57 +0300\0" "To\0Jonathan Cameron <jonathan.cameron@huawei.com>\0" "Cc\0linux-mm@kvack.org" Andrew Morton <akpm@linux-foundation.org> @@ -39,118 +39,6 @@ "> A minor editing issue in here that is stopping boot on arm64 platforms with latest\n" "> version of the mm tree.\n" "\n" - "Can you please try the following patch:\n" - "\n" - "\n" - "From 079bd5d24a01df3df9500d0a33d89cb9f7da4588 Mon Sep 17 00:00:00 2001\n" - "From: Mike Rapoport <rppt@linux.vnet.ibm.com>\n" - "Date: Wed, 19 Sep 2018 13:29:27 +0300\n" - "Subject: [PATCH] of/fdt: fixup #ifdefs after removal of HAVE_MEMBLOCK config\n" - " option\n" - "\n" - "The removal of HAVE_MEMBLOCK configuration option, mistakenly dropped the\n" - "wrong #endif. This patch restores that #endif and removes the part that\n" - "should have been actually removed, starting from #else and up to the\n" - "correct #endif\n" - "\n" - "Reported-by: Jonathan Cameron <jonathan.cameron@huawei.com>\n" - "Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>\n" - "---\n" - " drivers/of/fdt.c | 21 +--------------------\n" - " 1 file changed, 1 insertion(+), 20 deletions(-)\n" - "\n" - "diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c\n" - "index 48314e9..bb532aa 100644\n" - "--- a/drivers/of/fdt.c\n" - "+++ b/drivers/of/fdt.c\n" - "@@ -1119,6 +1119,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,\n" - " #endif\n" - " #ifndef MAX_MEMBLOCK_ADDR\n" - " #define MAX_MEMBLOCK_ADDR\t((phys_addr_t)~0)\n" - "+#endif\n" - " \n" - " void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)\n" - " {\n" - "@@ -1175,26 +1176,6 @@ int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,\n" - " \treturn memblock_reserve(base, size);\n" - " }\n" - " \n" - "-#else\n" - "-void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)\n" - "-{\n" - "-\tWARN_ON(1);\n" - "-}\n" - "-\n" - "-int __init __weak early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size)\n" - "-{\n" - "-\treturn -ENOSYS;\n" - "-}\n" - "-\n" - "-int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,\n" - "-\t\t\t\t\tphys_addr_t size, bool nomap)\n" - "-{\n" - "-\tpr_err(\"Reserved memory not supported, ignoring range %pa - %pa%s\\n\",\n" - "-\t\t &base, &size, nomap ? \" (nomap)\" : \"\");\n" - "-\treturn -ENOSYS;\n" - "-}\n" - "-#endif\n" - "-\n" - " static void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)\n" - " {\n" - " \treturn memblock_alloc(size, align);\n" - "-- \n" - "2.7.4\n" - "\n" - " \n" - "> > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c\n" - "> > index 76c83c1..bd841bb 100644\n" - "> > --- a/drivers/of/fdt.c\n" - "> > +++ b/drivers/of/fdt.c\n" - "> > @@ -1115,13 +1115,11 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,\n" - "> > \treturn 1;\n" - "> > }\n" - "> > \n" - "> > -#ifdef CONFIG_HAVE_MEMBLOCK\n" - "> > #ifndef MIN_MEMBLOCK_ADDR\n" - "> > #define MIN_MEMBLOCK_ADDR\t__pa(PAGE_OFFSET)\n" - "> > #endif\n" - "> > #ifndef MAX_MEMBLOCK_ADDR\n" - "> > #define MAX_MEMBLOCK_ADDR\t((phys_addr_t)~0)\n" - "> > -#endif\n" - "> \n" - "> This isn't the right #endif. It is matching with the #ifndef MAX_MEMBLOCK_ADDR\n" - "> not the intented #ifdef CONFIG_HAVE_MEMBLOCK.\n" - "> \n" - "> Now I haven't chased through the exact reason this is causing my acpi\n" - "> arm64 system not to boot on the basis it is obviously miss-matched anyway\n" - "> and I'm inherently lazy. It's resulting in stubs replacing the following weak\n" - "> functions.\n" - "> \n" - "> early_init_dt_add_memory_arch\n" - "> (this is defined elsewhere for some architectures but not arm)\n" - "> \n" - "> early_init_dt_mark_hotplug_memory_arch\n" - "> (there is only one definition of this in the kernel so it doesn't\n" - "> need to be weak or in the header etc).\n" - "> \n" - "> early_init_dt_reserve_memory_arch\n" - "> (defined on mips but nothing else)\n" - "> \n" - "> Taking out the right endif also lets you drop an #else removing some stub\n" - "> functions further down in here.\n" - "> \n" - "> Nice cleanup in general btw.\n" - "> \n" - "> Thanks,\n" - "> \n" - "> Jonathan\n" - "> > \n" - "> > void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)\n" - "> > {\n" - "> \n" - "\n" - "-- \n" - "Sincerely yours,\n" - Mike. + Can you please try the following patch: -f8d44207bcc8f2d7acf7ecba86da434cf1df89502bd74e3219f6fbe8b0654397 +c692849dbfdded6fd3a1d379985fddfdd313fecadbc75b4387ddb5f3f40916e5
diff --git a/a/1.txt b/N2/1.txt index 7dfce45..a0587e6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -17,7 +17,7 @@ On Wed, Sep 19, 2018 at 10:04:49AM +0100, Jonathan Cameron wrote: Can you please try the following patch: -From 079bd5d24a01df3df9500d0a33d89cb9f7da4588 Mon Sep 17 00:00:00 2001 +>From 079bd5d24a01df3df9500d0a33d89cb9f7da4588 Mon Sep 17 00:00:00 2001 From: Mike Rapoport <rppt@linux.vnet.ibm.com> Date: Wed, 19 Sep 2018 13:29:27 +0300 Subject: [PATCH] of/fdt: fixup #ifdefs after removal of HAVE_MEMBLOCK config diff --git a/a/content_digest b/N2/content_digest index 598300d..cf167df 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "ref\020180919100449.00006df9@huawei.com\0" "From\0Mike Rapoport <rppt@linux.vnet.ibm.com>\0" "Subject\0Re: [RFC PATCH 03/29] mm: remove CONFIG_HAVE_MEMBLOCK\0" - "Date\0Wed, 19 Sep 2018 10:34:57 +0000\0" + "Date\0Wed, 19 Sep 2018 13:34:57 +0300\0" "To\0Jonathan Cameron <jonathan.cameron@huawei.com>\0" "Cc\0linux-mm@kvack.org" Andrew Morton <akpm@linux-foundation.org> @@ -42,7 +42,7 @@ "Can you please try the following patch:\n" "\n" "\n" - "From 079bd5d24a01df3df9500d0a33d89cb9f7da4588 Mon Sep 17 00:00:00 2001\n" + ">From 079bd5d24a01df3df9500d0a33d89cb9f7da4588 Mon Sep 17 00:00:00 2001\n" "From: Mike Rapoport <rppt@linux.vnet.ibm.com>\n" "Date: Wed, 19 Sep 2018 13:29:27 +0300\n" "Subject: [PATCH] of/fdt: fixup #ifdefs after removal of HAVE_MEMBLOCK config\n" @@ -153,4 +153,4 @@ "Sincerely yours,\n" Mike. -f8d44207bcc8f2d7acf7ecba86da434cf1df89502bd74e3219f6fbe8b0654397 +0e90095bbbe3f908d58917e287472dabb73b68bb0060be24d31ce84badcb6fcb
diff --git a/a/content_digest b/N3/content_digest index 598300d..48ac71d 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -3,7 +3,7 @@ "ref\020180919100449.00006df9@huawei.com\0" "From\0Mike Rapoport <rppt@linux.vnet.ibm.com>\0" "Subject\0Re: [RFC PATCH 03/29] mm: remove CONFIG_HAVE_MEMBLOCK\0" - "Date\0Wed, 19 Sep 2018 10:34:57 +0000\0" + "Date\0Wed, 19 Sep 2018 13:34:57 +0300\0" "To\0Jonathan Cameron <jonathan.cameron@huawei.com>\0" "Cc\0linux-mm@kvack.org" Andrew Morton <akpm@linux-foundation.org> @@ -153,4 +153,4 @@ "Sincerely yours,\n" Mike. -f8d44207bcc8f2d7acf7ecba86da434cf1df89502bd74e3219f6fbe8b0654397 +0357f4cda91b1be92f98dd5b55be540140cd98b7512f2df872d4d57c4514ce78
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.