From: Heiko Carstens Date: Fri, 13 May 2016 09:10:09 +0000 (+0200) Subject: s390/vmem: align segment and region tables to 16k X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2e9996fcf8b8f933f9496cc885c9e05730f23c9e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git s390/vmem: align segment and region tables to 16k Usually segment and region tables are 16k aligned due to the way the buddy allocator works. This is not true for the vmem code which only asks for a 4k alignment. In order to be consistent enforce a 16k alignment here as well. This alignment will be assumed and therefore is required by the pageattr code. Signed-off-by: Heiko Carstens Acked-by: Christian Borntraeger Acked-by: Martin Schwidefsky Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index d48cf25cfe99..a64b91a8e5ac 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c @@ -29,9 +29,11 @@ static LIST_HEAD(mem_segs); static void __ref *vmem_alloc_pages(unsigned int order) { + unsigned long size = PAGE_SIZE << order; + if (slab_is_available()) return (void *)__get_free_pages(GFP_KERNEL, order); - return alloc_bootmem_pages((1 << order) * PAGE_SIZE); + return alloc_bootmem_align(size, size); } static inline pud_t *vmem_pud_alloc(void)