diff for duplicates of <20180906131433.GI27492@rapoport-lnx> diff --git a/a/1.txt b/N1/1.txt index 9492611..a6555f1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -239,7 +239,7 @@ Should have been > > - area = alloc_bootmem(size); > > + area = memblock_alloc(size, 0); > > -> > if (load_initrd(initrd, area, size) = -1) +> > if (load_initrd(initrd, area, size) == -1) > > return 0; > > diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c > > index 3b20607..fd887c1 100644 @@ -304,7 +304,7 @@ Should have been > > > > - new = alloc_bootmem(sizeof(*new)); > > + new = memblock_alloc(sizeof(*new), 0); -> > if (new = NULL) { +> > if (new == NULL) { > > pr_err("Alloc_bootmem failed\n"); > > return 1; > > diff --git a/arch/xtensa/platforms/iss/setup.c b/arch/xtensa/platforms/iss/setup.c diff --git a/a/content_digest b/N1/content_digest index 6dcca1d..6d469fe 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020180906085515.GF14951@dhcp22.suse.cz\0" "From\0Mike Rapoport <rppt@linux.vnet.ibm.com>\0" "Subject\0Re: [RFC PATCH 21/29] memblock: replace alloc_bootmem with memblock_alloc\0" - "Date\0Thu, 06 Sep 2018 13:14:34 +0000\0" + "Date\0Thu, 6 Sep 2018 16:14:34 +0300\0" "To\0Michal Hocko <mhocko@kernel.org>\0" "Cc\0linux-mm@kvack.org" Andrew Morton <akpm@linux-foundation.org> @@ -262,7 +262,7 @@ "> > -\tarea = alloc_bootmem(size);\n" "> > +\tarea = memblock_alloc(size, 0);\n" "> > \n" - "> > \tif (load_initrd(initrd, area, size) = -1)\n" + "> > \tif (load_initrd(initrd, area, size) == -1)\n" "> > \t\treturn 0;\n" "> > diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c\n" "> > index 3b20607..fd887c1 100644\n" @@ -327,7 +327,7 @@ "> > \n" "> > -\tnew = alloc_bootmem(sizeof(*new));\n" "> > +\tnew = memblock_alloc(sizeof(*new), 0);\n" - "> > \tif (new = NULL) {\n" + "> > \tif (new == NULL) {\n" "> > \t\tpr_err(\"Alloc_bootmem failed\\n\");\n" "> > \t\treturn 1;\n" "> > diff --git a/arch/xtensa/platforms/iss/setup.c b/arch/xtensa/platforms/iss/setup.c\n" @@ -386,4 +386,4 @@ "Sincerely yours,\n" Mike. -f77c3bf43368b7039bfb14939f39f636aa20603e7776aadf687ada67719a5b35 +b0408bc0d30e0c46dd91a3624b90886bf465093bbc15511205f2c886c7a00207
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.