From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932181AbbLVAAR (ORCPT ); Mon, 21 Dec 2015 19:00:17 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:33062 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752310AbbLUXsH (ORCPT ); Mon, 21 Dec 2015 18:48:07 -0500 From: Al Viro To: linux-kernel@vger.kernel.org Cc: Linus Torvalds Subject: [POC][PATCH 43/83] arm64 vdso: get rid of pointless casts Date: Mon, 21 Dec 2015 23:47:16 +0000 Message-Id: <1450741676-5865-43-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20151221234615.GW20997@ZenIV.linux.org.uk> References: <20151221234615.GW20997@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro ... with two added to cope with flush_icache_range() calling conventions Signed-off-by: Al Viro --- arch/arm64/kernel/vdso.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 07e4d14..f49e158 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -62,22 +62,21 @@ static int alloc_vectors_page(void) int kuser_sz = __kuser_helper_end - __kuser_helper_start; int sigret_sz = __aarch32_sigret_code_end - __aarch32_sigret_code_start; - unsigned long vpage; - - vpage = (unsigned long)get_zeroed_page(GFP_ATOMIC); + void *vpage = get_zeroed_page(GFP_ATOMIC); if (!vpage) return -ENOMEM; /* kuser helpers */ - memcpy((void *)vpage + 0x1000 - kuser_sz, __kuser_helper_start, + memcpy(vpage + 0x1000 - kuser_sz, __kuser_helper_start, kuser_sz); /* sigreturn code */ - memcpy((void *)vpage + AARCH32_KERN_SIGRET_CODE_OFFSET, + memcpy(vpage + AARCH32_KERN_SIGRET_CODE_OFFSET, __aarch32_sigret_code_start, sigret_sz); - flush_icache_range(vpage, vpage + PAGE_SIZE); + flush_icache_range((unsigned long)vpage, + (unsigned long)vpage + PAGE_SIZE); vectors_page[0] = virt_to_page(vpage); return 0; -- 2.1.4