From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e33.co.us.ibm.com (e33.co.us.ibm.com [32.97.110.151]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e33.co.us.ibm.com", Issuer "GeoTrust SSL CA" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 3A41A2C00D5 for ; Wed, 3 Oct 2012 12:59:45 +1000 (EST) Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 2 Oct 2012 20:59:43 -0600 Message-ID: <506BAA1B.4090803@linux.vnet.ibm.com> Date: Tue, 02 Oct 2012 21:59:39 -0500 From: Nathan Fontenot MIME-Version: 1.0 To: devicetree-discuss@lists.ozlabs.org, cbe-oss-dev@lists.ozlabs.org, LKML , linuxppc-dev@lists.ozlabs.org Subject: [PATCH 5/5] Remove the pSeries_reconfig.h file References: <506B2E63.5090900@linux.vnet.ibm.com> In-Reply-To: <506B2E63.5090900@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Remove the pSeries_reconfig.h header file. At this point there is only one definition in the file, pSeries_coalesce_init(), which can be moved to rtas.h. Signed-off-by: Nathan Fontenot --- arch/powerpc/include/asm/pSeries_reconfig.h | 15 --------------- arch/powerpc/include/asm/rtas.h | 5 +++++ arch/powerpc/kernel/rtas.c | 1 - arch/powerpc/platforms/pseries/smp.c | 1 - 4 files changed, 5 insertions(+), 17 deletions(-) Index: dt-next/arch/powerpc/include/asm/pSeries_reconfig.h =================================================================== --- dt-next.orig/arch/powerpc/include/asm/pSeries_reconfig.h 2012-10-02 09:14:01.000000000 -0500 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#ifndef _PPC64_PSERIES_RECONFIG_H -#define _PPC64_PSERIES_RECONFIG_H -#ifdef __KERNEL__ - -#ifdef CONFIG_PPC_PSERIES -/* Not the best place to put this, will be fixed when we move some - * of the rtas suspend-me stuff to pseries */ -extern void pSeries_coalesce_init(void); -#else /* !CONFIG_PPC_PSERIES */ -static inline void pSeries_coalesce_init(void) { } -#endif /* CONFIG_PPC_PSERIES */ - - -#endif /* __KERNEL__ */ -#endif /* _PPC64_PSERIES_RECONFIG_H */ Index: dt-next/arch/powerpc/include/asm/rtas.h =================================================================== --- dt-next.orig/arch/powerpc/include/asm/rtas.h 2012-10-02 09:14:01.000000000 -0500 +++ dt-next/arch/powerpc/include/asm/rtas.h 2012-10-02 09:14:40.000000000 -0500 @@ -353,8 +353,13 @@ return 1; return 0; } + +/* Not the best place to put pSeries_coalesce_init, will be fixed when we + * move some of the rtas suspend-me stuff to pseries */ +extern void pSeries_coalesce_init(void); #else static inline int page_is_rtas_user_buf(unsigned long pfn) { return 0;} +static inline void pSeries_coalesce_init(void) { } #endif extern int call_rtas(const char *, int, int, unsigned long *, ...); Index: dt-next/arch/powerpc/kernel/rtas.c =================================================================== --- dt-next.orig/arch/powerpc/kernel/rtas.c 2012-10-02 09:14:01.000000000 -0500 +++ dt-next/arch/powerpc/kernel/rtas.c 2012-10-02 09:14:40.000000000 -0500 @@ -42,7 +42,6 @@ #include #include #include -#include struct rtas_t rtas = { .lock = __ARCH_SPIN_LOCK_UNLOCKED Index: dt-next/arch/powerpc/platforms/pseries/smp.c =================================================================== --- dt-next.orig/arch/powerpc/platforms/pseries/smp.c 2012-10-02 09:14:01.000000000 -0500 +++ dt-next/arch/powerpc/platforms/pseries/smp.c 2012-10-02 09:14:40.000000000 -0500 @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include