diff for duplicates of <20180906125800.GH27492@rapoport-lnx> diff --git a/a/1.txt b/N1/1.txt index 9b176b5..5fe8464 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -209,7 +209,7 @@ more elaborate descriptions for all patches. > > - __alloc_bootmem(i << 2, SMP_CACHE_BYTES, 0UL); > > + memblock_alloc_from(i << 2, SMP_CACHE_BYTES, 0UL); > > -> > if (sparc_valid_addr_bitmap = NULL) { +> > if (sparc_valid_addr_bitmap == NULL) { > > prom_printf("mem_init: Cannot alloc valid_addr_bitmap.\n"); > > diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c > > index 578ec3d..51cd583 100644 @@ -259,7 +259,8 @@ more elaborate descriptions for all patches. > > + SRMMU_NOCACHE_ALIGN_MAX, 0UL); > > memset(srmmu_nocache_pool, 0, srmmu_nocache_size); > > -> > srmmu_nocache_bitmap > > - __alloc_bootmem(BITS_TO_LONGS(bitmap_bits) * sizeof(long), +> > srmmu_nocache_bitmap = +> > - __alloc_bootmem(BITS_TO_LONGS(bitmap_bits) * sizeof(long), > > - SMP_CACHE_BYTES, 0UL); > > + memblock_alloc_from(BITS_TO_LONGS(bitmap_bits) * sizeof(long), > > + SMP_CACHE_BYTES, 0UL); diff --git a/a/content_digest b/N1/content_digest index 45f1cf8..d59c6d7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020180906085205.GE14951@dhcp22.suse.cz\0" "From\0Mike Rapoport <rppt@linux.vnet.ibm.com>\0" "Subject\0Re: [RFC PATCH 20/29] memblock: replace __alloc_bootmem with memblock_alloc_from\0" - "Date\0Thu, 06 Sep 2018 12:58:00 +0000\0" + "Date\0Thu, 6 Sep 2018 15:58:00 +0300\0" "To\0Michal Hocko <mhocko@kernel.org>\0" "Cc\0linux-mm@kvack.org" Andrew Morton <akpm@linux-foundation.org> @@ -232,7 +232,7 @@ "> > -\t\t__alloc_bootmem(i << 2, SMP_CACHE_BYTES, 0UL);\n" "> > +\t\tmemblock_alloc_from(i << 2, SMP_CACHE_BYTES, 0UL);\n" "> > \n" - "> > \tif (sparc_valid_addr_bitmap = NULL) {\n" + "> > \tif (sparc_valid_addr_bitmap == NULL) {\n" "> > \t\tprom_printf(\"mem_init: Cannot alloc valid_addr_bitmap.\\n\");\n" "> > diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c\n" "> > index 578ec3d..51cd583 100644\n" @@ -282,7 +282,8 @@ "> > +\t\t\t\t\t\t SRMMU_NOCACHE_ALIGN_MAX, 0UL);\n" "> > \tmemset(srmmu_nocache_pool, 0, srmmu_nocache_size);\n" "> > \n" - "> > \tsrmmu_nocache_bitmap > > -\t\t__alloc_bootmem(BITS_TO_LONGS(bitmap_bits) * sizeof(long),\n" + "> > \tsrmmu_nocache_bitmap =\n" + "> > -\t\t__alloc_bootmem(BITS_TO_LONGS(bitmap_bits) * sizeof(long),\n" "> > -\t\t\t\tSMP_CACHE_BYTES, 0UL);\n" "> > +\t\tmemblock_alloc_from(BITS_TO_LONGS(bitmap_bits) * sizeof(long),\n" "> > +\t\t\t\t SMP_CACHE_BYTES, 0UL);\n" @@ -330,4 +331,4 @@ "Sincerely yours,\n" Mike. -ca6bf4abab74a8fe0f6cf65fd8cf40f471182fdc690b9a3a823a2a1ca9f3ccf9 +bce56ce4850be20bed943d44e09d04de549bd150203a6b0689cc51d89ed08b6c
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.