diff options
| author | Mike Rapoport <rppt@linux.ibm.com> | 2018-10-17 11:18:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-10-19 17:25:08 +1100 |
| commit | c38b67f8ed15cdaa061debee9893b89407c88e89 (patch) | |
| tree | cac4726d9b06b7175dc455f3f51732593939b30b | |
| parent | df29347d65bb249d65dc4612ee6ef3bf5cd5fb14 (diff) | |
| download | 96b-common-c38b67f8ed15cdaa061debee9893b89407c88e89.tar.gz | |
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@linux.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | arch/powerpc/kernel/paca.c | 2 | ||||
| -rw-r--r-- | drivers/firmware/efi/memmap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c index f331a0054b3a..913bfca09c4f 100644 --- a/arch/powerpc/kernel/paca.c +++ b/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); } diff --git a/drivers/firmware/efi/memmap.c b/drivers/firmware/efi/memmap.c index ef618bceb79a..fa2904fb841f 100644 --- a/drivers/firmware/efi/memmap.c +++ b/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) |