From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rdRYc26vnzDq5f for ; Mon, 27 Jun 2016 21:29:56 +1000 (AEST) From: Benjamin Herrenschmidt To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 04/38] powerpc: Make PTRRELOC() 32-bit only Date: Mon, 27 Jun 2016 21:29:02 +1000 Message-Id: <1467026976-7974-5-git-send-email-benh@kernel.crashing.org> In-Reply-To: <1467026976-7974-1-git-send-email-benh@kernel.crashing.org> References: <1467026976-7974-1-git-send-email-benh@kernel.crashing.org> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , PTRRELOC is only used by 32-bit code since on 32-bit systems, early_init can be run with relocation off and running at an offset. Define it to identity on 64-bit Signed-off-by: Benjamin Herrenschmidt --- arch/powerpc/include/asm/setup.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h index e9d384c..fa0687e 100644 --- a/arch/powerpc/include/asm/setup.h +++ b/arch/powerpc/include/asm/setup.h @@ -19,7 +19,11 @@ extern unsigned long reloc_offset(void); extern unsigned long add_reloc_offset(unsigned long); extern void reloc_got2(unsigned long); +#ifdef CONFIG_PPC32 #define PTRRELOC(x) ((typeof(x)) add_reloc_offset((unsigned long)(x))) +#else +#define PTRRELOC(x) (x) +#endif void check_for_initrd(void); void initmem_init(void); -- 2.7.4