Received: by 10.192.165.156 with SMTP id m28csp1715959imm; Tue, 17 Apr 2018 04:25:41 -0700 (PDT) X-Google-Smtp-Source: AIpwx48hcw+zcO658CXpx2vC9dydrUow1XvQKSouFbm/VxFslOODe0f9qy/h5NItefNcyVjU7cpw X-Received: by 2002:a17:902:a70c:: with SMTP id w12-v6mr1659900plq.74.1523964341229; Tue, 17 Apr 2018 04:25:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523964341; cv=none; d=google.com; s=arc-20160816; b=AbqAiXaDtusSOwgnek5lDeqbu9DSDlKxKR5G/uIzWpHwQcVmLQzMMFotBvI5Il2zHq W2HU+vLEovFSINqJBB9NF0ojg5/NFcGDv1wRg/ZsWzwQXWiLhsR/iwejRqSopnW2BFtz EVa3Ho1MlZp+mhq4u287dJ3bpOy4IFwvPPyc8ZV3pDBBPFkSwc4ypahF15KRlynt3ZSX qgwDSssIHrZPjxWCMb0GUSQnVuI/DkKDIk7angukJzmKzANMbXiwG7YnyOeLt/3GcCu+ 0wqpkFgrgT2BP2nWHQabjlPiElVMnhQ6jbAzVOPkTATM4EbzQV9en+p3QLCvgEBOYf/n chkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:message-id:cc:to:subject:from :arc-authentication-results; bh=SjvB92jjlgMVMjeDcgHxLGOSirsNpixkjSrScQf6CN8=; b=jYyDccAvUZLaoLA5b+EiNodorP5EazJ0pnCYBFEiGEhXB0wefzxVgRx9eMxrFit93W 5Iesf1hCqnsWM/GiLWmVxiWpXbsk3+dwJAce/JAGKQJXAgcSPyPO2JYeTNH4tDPFL4/q Jm8MYL4+r6jL8z82C178Aw/vu03PL83Q5m+YU7tDXZ2dPxurPhukzPeWKaLkZoyik1ss oI1rIXiRLWExACmapXJzsBZjLKyn1AY5yMnjjnVrJQD29JszUGrUYX/kzuIIo4zj3W8H XjzuO4FKaBvZCk/426ycD/EUigZmVMNddZQPX6kcT81ksO8E6Ck5qhtodqVbT4CcngWF iimg== ARC-Authentication-Results: i=1; mx.google.com; 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 g15si11481228pgu.112.2018.04.17.04.25.27; Tue, 17 Apr 2018 04:25:41 -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; 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 S1752651AbeDQLXN (ORCPT + 99 others); Tue, 17 Apr 2018 07:23:13 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:50582 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751884AbeDQLXM (ORCPT ); Tue, 17 Apr 2018 07:23:12 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 40QNCV4PHzz9ttg2; Tue, 17 Apr 2018 13:23:02 +0200 (CEST) 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 Rs92gotrX1WY; Tue, 17 Apr 2018 13:23:02 +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 40QNCV3lbJz9ttSK; Tue, 17 Apr 2018 13:23:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 0B5D28B92B; Tue, 17 Apr 2018 13:23:11 +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 t4WMc9JlHXEc; Tue, 17 Apr 2018 13:23:10 +0200 (CEST) Received: from po15720vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.2]) by messagerie.si.c-s.fr (Postfix) with ESMTP id DCFC98B896; Tue, 17 Apr 2018 13:23:10 +0200 (CEST) Received: by po15720vm.idsi0.si.c-s.fr (Postfix, from userid 0) id BD2686C07F; Tue, 17 Apr 2018 13:23:10 +0200 (CEST) From: Christophe Leroy Subject: [PATCH] powerpc/misc: merge reloc_offset() and add_reloc_offset() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Message-Id: <20180417112310.BD2686C07F@po15720vm.idsi0.si.c-s.fr> Date: Tue, 17 Apr 2018 13:23:10 +0200 (CEST) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org reloc_offset() is the same as add_reloc_offset(0) Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/misc.S | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S index 384357cb8bc0..e1f3a5d054c4 100644 --- a/arch/powerpc/kernel/misc.S +++ b/arch/powerpc/kernel/misc.S @@ -25,23 +25,12 @@ /* * Returns (address we are running at) - (address we were linked at) * for use before the text and data are mapped to KERNELBASE. - */ - -_GLOBAL(reloc_offset) - mflr r0 - bl 1f -1: mflr r3 - PPC_LL r4,(2f-1b)(r3) - subf r3,r4,r3 - mtlr r0 - blr - .align 3 -2: PPC_LONG 1b - -/* * add_reloc_offset(x) returns x + reloc_offset(). */ + +_GLOBAL(reloc_offset) + li r3, 0 _GLOBAL(add_reloc_offset) mflr r0 bl 1f -- 2.13.3