No need of a NULL last element in pagelists, install_special_mapping() knows how long the list is.
Remove that element. Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu> --- arch/powerpc/kernel/vdso.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index 3bc4d5b1980b..daef14a284a3 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c @@ -752,7 +752,7 @@ static int __init vdso_init(void) #ifdef CONFIG_VDSO32 /* Make sure pages are in the correct state */ - vdso32_pagelist = kcalloc(vdso32_pages + 2, sizeof(struct page *), + vdso32_pagelist = kcalloc(vdso32_pages + 1, sizeof(struct page *), GFP_KERNEL); if (!vdso32_pagelist) goto alloc_failed; @@ -760,12 +760,11 @@ static int __init vdso_init(void) for (i = 0; i < vdso32_pages; i++) vdso32_pagelist[i] = virt_to_page(vdso32_kbase + i * PAGE_SIZE); - vdso32_pagelist[i++] = virt_to_page(vdso_data); - vdso32_pagelist[i] = NULL; + vdso32_pagelist[i] = virt_to_page(vdso_data); #endif #ifdef CONFIG_PPC64 - vdso64_pagelist = kcalloc(vdso64_pages + 2, sizeof(struct page *), + vdso64_pagelist = kcalloc(vdso64_pages + 1, sizeof(struct page *), GFP_KERNEL); if (!vdso64_pagelist) goto alloc_failed; @@ -773,8 +772,7 @@ static int __init vdso_init(void) for (i = 0; i < vdso64_pages; i++) vdso64_pagelist[i] = virt_to_page(vdso64_kbase + i * PAGE_SIZE); - vdso64_pagelist[i++] = virt_to_page(vdso_data); - vdso64_pagelist[i] = NULL; + vdso64_pagelist[i] = virt_to_page(vdso_data); #endif /* CONFIG_PPC64 */ smp_wmb(); -- 2.25.0