Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp4210264ybg; Tue, 29 Oct 2019 03:53:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqyU8IRWS48aqUwz/tUon5efoNcdSAr+ZCOpXsd0wcKJmHotkiN5LHuDxMPozhu5VbcXWKEH X-Received: by 2002:a17:906:6bcd:: with SMTP id t13mr2466265ejs.231.1572346436915; Tue, 29 Oct 2019 03:53:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572346436; cv=none; d=google.com; s=arc-20160816; b=Ht12dYmkJX+1OSji9U9wixUdaJqlabREHf2I5sEtrGVf2KN1LdMxXvNynb8BMB5qM/ a8yRpbzUpzq9+Z2BuQ8Jr281oeowKUq6JUwd/epkfL0n59rjlavUgk1pkciLUaByV+va 2DQl87Q2WZoUqWR5ydVhSVTq1ORWZTcNXOc+Iy8HLpwvqdm/BSoLazKSpqLATaYQGXts YtwyS/jR8WhSXrnlyA6wELcYl8118BpBVpkemB+tLzZV56lKU6WeMuk+37K9Ij+Ws/vG /VeR6dxzx9wvhGcwW0jLt1Q4pAeeq+AtIH97Z0TqLNi+nWmnx6zxpj+sfKs0sGx+VjrP ADdw== 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=xWV6oWfFLWcIyU80fN4O23Nj6FAqGh/qPC9Al+Nw1Uc=; b=tFPC5s6kajBFM+gRRmkgm46f/CGsR9QygkOby9GdbzXhiLDI/fVeMRYfH4m1S8fhEu IZR1n0p5Zv2mEt0wdGmuxy7LFCStrhczO6Lkmv80jfOqsqur0lhsAd0uEK8+mfwthUUh lYuR6LPD/pFaDxVCGU/DO5aVc1V6LiHzaprq1s/tO4ymvwcnEg5CDDeQx34SyNyfgQ/f FuLnPMmsgvbyFzm1gFdSX/dvJwdyukSi5XcqwRBw8GnqpxmF5PTBL4Ca5HBSNr6jOLTz oHxU19h6UJ0MIVmdnZAzvAFDwFROpYxFGOVggDBpbxRywPoDb3O2NP7PjBGpAjbdbA43 YSng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=vYC9XHXm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q20si3018737ejt.360.2019.10.29.03.53.32; Tue, 29 Oct 2019 03:53:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=vYC9XHXm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387413AbfJ2Jxg (ORCPT + 99 others); Tue, 29 Oct 2019 05:53:36 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:4802 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733196AbfJ2JxN (ORCPT ); Tue, 29 Oct 2019 05:53:13 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 472RjM0wwlz9tysl; Tue, 29 Oct 2019 10:53:11 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=vYC9XHXm; 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 JGh0JQub58ey; Tue, 29 Oct 2019 10:53:11 +0100 (CET) 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 472RjL6spdz9tysj; Tue, 29 Oct 2019 10:53:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1572342791; bh=xWV6oWfFLWcIyU80fN4O23Nj6FAqGh/qPC9Al+Nw1Uc=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=vYC9XHXmPZrA3UkXsOOOpZe4CFgLCZ6Rq/2+3JJxBX7hldNMzBACB7+orHvaC8p/A vLksRlPeLB7BksI3DdDTVAbMfh8eWnwZFj+ncyFMMD2WD7sWBfMFn5rzSAXO6ILX/B unAWUsJIwo9IJCTgkLewkzuIcSzNO8RYuXeDKZXk= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id F11DF8B84E; Tue, 29 Oct 2019 10:53:11 +0100 (CET) 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 u8IokpS-Zt5O; Tue, 29 Oct 2019 10:53:11 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id B10468B755; Tue, 29 Oct 2019 10:53:11 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id 7C5866B6FD; Tue, 29 Oct 2019 09:53:11 +0000 (UTC) Message-Id: <9ce0a935385af6ecb3325961d4894b16627ec1ae.1572342582.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v3 6/8] powerpc/vdso32: use LOAD_REG_IMMEDIATE() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 29 Oct 2019 09:53:11 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use LOAD_REG_IMMEDIATE() to load registers with immediate value. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/vdso32/gettimeofday.S | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S index 9867c7b9a25a..ff431482739c 100644 --- a/arch/powerpc/kernel/vdso32/gettimeofday.S +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S @@ -39,8 +39,7 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday) get_datapage r9, r0 cmplwi r10,0 /* check if tv is NULL */ beq 3f - lis r7,1000000@ha /* load up USEC_PER_SEC */ - addi r7,r7,1000000@l /* so we get microseconds in r4 */ + LOAD_REG_IMMEDIATE(r7, 1000000) /* load up USEC_PER_SEC */ bl __do_get_tspec@local /* get sec/usec from tb & kernel */ stw r3,TVAL32_TV_SEC(r10) stw r4,TVAL32_TV_USEC(r10) @@ -83,8 +82,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) .cfi_register lr,r12 mr r11,r4 /* r11 saves tp */ get_datapage r9, r0 - lis r7,NSEC_PER_SEC@h /* want nanoseconds */ - ori r7,r7,NSEC_PER_SEC@l + LOAD_REG_IMMEDIATE(r7, NSEC_PER_SEC) /* load up NSEC_PER_SEC */ beq cr5, .Lcoarse_clocks .Lprecise_clocks: bl __do_get_tspec@local /* get sec/nsec from tb & kernel */ -- 2.13.3