Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp3816521ybz; Mon, 20 Apr 2020 09:58:52 -0700 (PDT) X-Google-Smtp-Source: APiQypLrhdN0jBtwu51EY4+4ac+cvBieHyPk8I5WAvY5c2I1qPkV7lzauYAyo/GugWs1vFD03kxf X-Received: by 2002:aa7:dd14:: with SMTP id i20mr2671166edv.225.1587401931894; Mon, 20 Apr 2020 09:58:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587401931; cv=none; d=google.com; s=arc-20160816; b=v8LGyxpfztD90ArtxZD0FDADhEx1WTODBQ9vm4A3RwJCM0erwqbHZaJCg04sVmeZyS psqUEQfLsZTwkCOA6TpAAg7/pzhWehCo0oI8XcqAinCl7p0Y3ygktZQgwJihJOq9L8Ni 2mpz5XtQ6BfonWPYDHD8tgmL4Yxh8787JGzEXKPlmuGNQJfX40eJhPVcVRgbtkIwp5+S nS0yWA/fkDrU8MiPLZCSyKn2j4TdISR6p+VjNTyAJBMj/8iW7mZAxeXHU45xcESGtsuG CXErCVIGYK73Xdvcpkdvsa+hrrAmRYHqdri17Xx8CeJhzqyVNCUlngIspsWKbEGwy1kH /5CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=EKhUoEDVDd4Swu48e7f5JedcZIzxDiu4HRMR6AH4pw8=; b=CNQFEQvKMOxyY1W+pKOj4Su5vyV8Kbtpyxf9D5xqxNOVaHCgaY5+Xi3hFtQ09yvD8e cjOO6sZvfopi6EyK3cgH4wV6FXzEbOMNQut/QN/CTOHu7OKqBsw/W8M/Dsbud4VcomnD 7ML/sQjL75wzrBoLLgEJlTZx/OvbvV21djCbgyw+Y3vlegyQl8HIhjhdHJl7Shoju2n0 LWy1sfkemy1/uskkuocXUW27N06VfbUlfZkt1J/PlBfmVki8b1HZW53w0tdDsX8TDPCO aUMAKJLZkIXtMg4QVkBiunUCaL1tTmtki6gPhdINAwmfX01GXqNe9zL90QYmOPEYovwS dSIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b="Z2Z/2BvU"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h23si820098ejs.491.2020.04.20.09.58.27; Mon, 20 Apr 2020 09:58:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b="Z2Z/2BvU"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726457AbgDTQ4e (ORCPT + 99 others); Mon, 20 Apr 2020 12:56:34 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:19344 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726419AbgDTQ4d (ORCPT ); Mon, 20 Apr 2020 12:56:33 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 495XsP4G24z9txc3; Mon, 20 Apr 2020 18:56:25 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=Z2Z/2BvU; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id PW-Na4wQxz7A; Mon, 20 Apr 2020 18:56:25 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 495XsP32tbz9txcs; Mon, 20 Apr 2020 18:56:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1587401785; bh=EKhUoEDVDd4Swu48e7f5JedcZIzxDiu4HRMR6AH4pw8=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=Z2Z/2BvUze7T8FTqepPVU0SoCmNHr5AOy3sr5e2HAqhEAhI7j5bXNSC8OHQOJQK2Q Xl6BHxriHv6pScqHNTbNESSfJ2lfyL/PUMxKKBzMN5DeMvppusuu6m02Pl9Azod4zG i5maDnDqNYtMN3Exq8S0bTOsfWK1WxM5Ww+09MjE= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 4432F8B784; Mon, 20 Apr 2020 18:56:31 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id IsbGZZPyem1V; Mon, 20 Apr 2020 18:56:31 +0200 (CEST) Received: from pc16570vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id EE3968B78A; Mon, 20 Apr 2020 18:56:30 +0200 (CEST) Received: by pc16570vm.idsi0.si.c-s.fr (Postfix, from userid 0) id C5713657AE; Mon, 20 Apr 2020 16:56:30 +0000 (UTC) Message-Id: <7d981bcbb129bb4e7fdc7663ce353323eb5c4e68.1587401492.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v7 3/7] powerpc/vdso: Remove unused \tmp param in __get_datapage() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , nathanl@linux.ibm.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, arnd@arndb.de, tglx@linutronix.de, vincenzo.frascino@arm.com, luto@kernel.org Date: Mon, 20 Apr 2020 16:56:30 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The \tmp param is not used anymore, remove it. Signed-off-by: Christophe Leroy --- v7: New patch, splitted out of preceding patch --- arch/powerpc/include/asm/vdso_datapage.h | 2 +- arch/powerpc/kernel/vdso32/cacheflush.S | 2 +- arch/powerpc/kernel/vdso32/datapage.S | 4 ++-- arch/powerpc/kernel/vdso32/gettimeofday.S | 8 ++++---- arch/powerpc/kernel/vdso64/cacheflush.S | 2 +- arch/powerpc/kernel/vdso64/datapage.S | 4 ++-- arch/powerpc/kernel/vdso64/gettimeofday.S | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h index 11886467dfdf..f3d7e4e2a45b 100644 --- a/arch/powerpc/include/asm/vdso_datapage.h +++ b/arch/powerpc/include/asm/vdso_datapage.h @@ -116,7 +116,7 @@ extern struct vdso_data *vdso_data; #else /* __ASSEMBLY__ */ -.macro get_datapage ptr, tmp +.macro get_datapage ptr bcl 20, 31, .+4 999: mflr \ptr diff --git a/arch/powerpc/kernel/vdso32/cacheflush.S b/arch/powerpc/kernel/vdso32/cacheflush.S index 3440ddf21c8b..017843bf5382 100644 --- a/arch/powerpc/kernel/vdso32/cacheflush.S +++ b/arch/powerpc/kernel/vdso32/cacheflush.S @@ -27,7 +27,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) #ifdef CONFIG_PPC64 mflr r12 .cfi_register lr,r12 - get_datapage r10, r0 + get_datapage r10 mtlr r12 #endif diff --git a/arch/powerpc/kernel/vdso32/datapage.S b/arch/powerpc/kernel/vdso32/datapage.S index 5513a4f8253e..0513a2eabec8 100644 --- a/arch/powerpc/kernel/vdso32/datapage.S +++ b/arch/powerpc/kernel/vdso32/datapage.S @@ -28,7 +28,7 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map) mflr r12 .cfi_register lr,r12 mr. r4,r3 - get_datapage r3, r0 + get_datapage r3 mtlr r12 addi r3,r3,CFG_SYSCALL_MAP32 beqlr @@ -49,7 +49,7 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq) .cfi_startproc mflr r12 .cfi_register lr,r12 - get_datapage r3, r0 + get_datapage r3 lwz r4,(CFG_TB_TICKS_PER_SEC + 4)(r3) lwz r3,CFG_TB_TICKS_PER_SEC(r3) mtlr r12 diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S index a3951567118a..0bbdce0f2a9c 100644 --- a/arch/powerpc/kernel/vdso32/gettimeofday.S +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S @@ -34,7 +34,7 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday) mr. r10,r3 /* r10 saves tv */ mr r11,r4 /* r11 saves tz */ - get_datapage r9, r0 + get_datapage r9 beq 3f LOAD_REG_IMMEDIATE(r7, 1000000) /* load up USEC_PER_SEC */ bl __do_get_tspec@local /* get sec/usec from tb & kernel */ @@ -79,7 +79,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) mflr r12 /* r12 saves lr */ .cfi_register lr,r12 mr r11,r4 /* r11 saves tp */ - get_datapage r9, r0 + get_datapage r9 LOAD_REG_IMMEDIATE(r7, NSEC_PER_SEC) /* load up NSEC_PER_SEC */ beq cr5, .Lcoarse_clocks .Lprecise_clocks: @@ -206,7 +206,7 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) mflr r12 .cfi_register lr,r12 - get_datapage r3, r0 + get_datapage r3 lwz r5, CLOCK_HRTIMER_RES(r3) mtlr r12 1: li r3,0 @@ -240,7 +240,7 @@ V_FUNCTION_BEGIN(__kernel_time) .cfi_register lr,r12 mr r11,r3 /* r11 holds t */ - get_datapage r9, r0 + get_datapage r9 lwz r3,STAMP_XTIME_SEC+LOPART(r9) diff --git a/arch/powerpc/kernel/vdso64/cacheflush.S b/arch/powerpc/kernel/vdso64/cacheflush.S index cab14324242b..61985de5758f 100644 --- a/arch/powerpc/kernel/vdso64/cacheflush.S +++ b/arch/powerpc/kernel/vdso64/cacheflush.S @@ -25,7 +25,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) .cfi_startproc mflr r12 .cfi_register lr,r12 - get_datapage r10, r0 + get_datapage r10 mtlr r12 lwz r7,CFG_DCACHE_BLOCKSZ(r10) diff --git a/arch/powerpc/kernel/vdso64/datapage.S b/arch/powerpc/kernel/vdso64/datapage.S index 03bb72c440dc..00760dc69d68 100644 --- a/arch/powerpc/kernel/vdso64/datapage.S +++ b/arch/powerpc/kernel/vdso64/datapage.S @@ -28,7 +28,7 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map) mflr r12 .cfi_register lr,r12 mr r4,r3 - get_datapage r3, r0 + get_datapage r3 mtlr r12 addi r3,r3,CFG_SYSCALL_MAP64 cmpldi cr0,r4,0 @@ -50,7 +50,7 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq) .cfi_startproc mflr r12 .cfi_register lr,r12 - get_datapage r3, r0 + get_datapage r3 ld r3,CFG_TB_TICKS_PER_SEC(r3) mtlr r12 crclr cr0*4+so diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S index e54c4ce4d356..275f031d0bf1 100644 --- a/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/arch/powerpc/kernel/vdso64/gettimeofday.S @@ -26,7 +26,7 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday) mr r11,r3 /* r11 holds tv */ mr r10,r4 /* r10 holds tz */ - get_datapage r3, r0 + get_datapage r3 cmpldi r11,0 /* check if tv is NULL */ beq 2f lis r7,1000000@ha /* load up USEC_PER_SEC */ @@ -71,7 +71,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) mflr r12 /* r12 saves lr */ .cfi_register lr,r12 mr r11,r4 /* r11 saves tp */ - get_datapage r3, r0 + get_datapage r3 lis r7,NSEC_PER_SEC@h /* want nanoseconds */ ori r7,r7,NSEC_PER_SEC@l beq cr5,70f @@ -188,7 +188,7 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) mflr r12 .cfi_register lr,r12 - get_datapage r3, r0 + get_datapage r3 lwz r5, CLOCK_HRTIMER_RES(r3) mtlr r12 li r3,0 @@ -221,7 +221,7 @@ V_FUNCTION_BEGIN(__kernel_time) .cfi_register lr,r12 mr r11,r3 /* r11 holds t */ - get_datapage r3, r0 + get_datapage r3 ld r4,STAMP_XTIME_SEC(r3) -- 2.25.0