From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751810AbeDQH41 (ORCPT ); Tue, 17 Apr 2018 03:56:27 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:35210 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750967AbeDQH4Z (ORCPT ); Tue, 17 Apr 2018 03:56:25 -0400 From: Christophe Leroy Subject: [PATCH] powerpc/misc: get rid of add_reloc_offset() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Message-Id: <20180417075624.962AB6C038@po15720vm.idsi0.si.c-s.fr> Date: Tue, 17 Apr 2018 09:56:24 +0200 (CEST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org add_reloc_offset() is almost redundant with reloc_offset() Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/setup.h | 3 +-- arch/powerpc/kernel/misc.S | 16 ---------------- arch/powerpc/kernel/prom_init_check.sh | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h index 27fa52ed6d00..115e0896ffa7 100644 --- a/arch/powerpc/include/asm/setup.h +++ b/arch/powerpc/include/asm/setup.h @@ -17,10 +17,9 @@ extern void note_scsi_host(struct device_node *, void *); /* Used in very early kernel initialization. */ extern unsigned long reloc_offset(void); -extern unsigned long add_reloc_offset(unsigned long); extern void reloc_got2(unsigned long); -#define PTRRELOC(x) ((typeof(x)) add_reloc_offset((unsigned long)(x))) +#define PTRRELOC(x) ((typeof(x)) ((unsigned long)(x) + reloc_offset())) void check_for_initrd(void); void mem_topology_setup(void); diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S index 384357cb8bc0..2711b10ebdb3 100644 --- a/arch/powerpc/kernel/misc.S +++ b/arch/powerpc/kernel/misc.S @@ -39,22 +39,6 @@ _GLOBAL(reloc_offset) .align 3 2: PPC_LONG 1b -/* - * add_reloc_offset(x) returns x + reloc_offset(). - */ -_GLOBAL(add_reloc_offset) - mflr r0 - bl 1f -1: mflr r5 - PPC_LL r4,(2f-1b)(r5) - subf r5,r4,r5 - add r3,r3,r5 - mtlr r0 - blr - - .align 3 -2: PPC_LONG 1b - _GLOBAL(setjmp) mflr r0 PPC_STL r0,0(r3) diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh index acb6b9226352..ee9f63186b72 100644 --- a/arch/powerpc/kernel/prom_init_check.sh +++ b/arch/powerpc/kernel/prom_init_check.sh @@ -16,7 +16,7 @@ # If you really need to reference something from prom_init.o add # it to the list below: -WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush +WHITELIST="__bss_start __bss_stop copy_and_flush _end enter_prom memcpy memset reloc_offset __secondary_hold __secondary_hold_acknowledge __secondary_hold_spinloop __start strcmp strcpy strlcpy strlen strncmp strstr kstrtobool logo_linux_clut224 -- 2.13.3