The patch titled
Subject: memblock: fix missed uses of implicit alignment
has been removed from the -mm tree. Its filename was
memblock-stop-using-implicit-alignement-to-smp_cache_bytes-fix.patch
This patch was dropped because it was folded into memblock-stop-using-implicit-alignement-to-smp_cache_bytes.patch
------------------------------------------------------
From: Mike Rapoport <rppt@xxxxxxxxxxxxx>
Subject: memblock: fix missed uses of implicit alignment
A couple of memblock*alloc uses were missed during conversion from
implicit alignment setting with 'align = 0' to explicitly using
SMP_CACHE_BYTES. Fix them now.
Link: http://lkml.kernel.org/r/20181016133656.GA10925@rapoport-lnx
Signed-off-by: Mike Rapoport <rppt@xxxxxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/kernel/paca.c | 2 +-
drivers/firmware/efi/memmap.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/arch/powerpc/kernel/paca.c~memblock-stop-using-implicit-alignement-to-smp_cache_bytes-fix
+++ a/arch/powerpc/kernel/paca.c
@@ -198,7 +198,7 @@ void __init allocate_paca_ptrs(void)
paca_nr_cpu_ids = nr_cpu_ids;
paca_ptrs_size = sizeof(struct paca_struct *) * nr_cpu_ids;
- paca_ptrs = __va(memblock_phys_alloc(paca_ptrs_size, 0));
+ paca_ptrs = __va(memblock_phys_alloc(paca_ptrs_size, SMP_CACHE_BYTES));
memset(paca_ptrs, 0x88, paca_ptrs_size);
}
--- a/drivers/firmware/efi/memmap.c~memblock-stop-using-implicit-alignement-to-smp_cache_bytes-fix
+++ a/drivers/firmware/efi/memmap.c
@@ -15,7 +15,7 @@
static phys_addr_t __init __efi_memmap_alloc_early(unsigned long size)
{
- return memblock_phys_alloc(size, 0);
+ return memblock_phys_alloc(size, SMP_CACHE_BYTES);
}
static phys_addr_t __init __efi_memmap_alloc_late(unsigned long size)
_
Patches currently in -mm which might be from rppt@xxxxxxxxxxxxx are
memblock-stop-using-implicit-alignement-to-smp_cache_bytes.patch
