Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f459d63e authored by Nathan Fontenot's avatar Nathan Fontenot Committed by Benjamin Herrenschmidt
Browse files

powerpc+of: Remove the pSeries_reconfig.h file 



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: default avatarNathan Fontenot <nfont@linux.vnet.ibm.com>
Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 79d1c712

arch/powerpc/include/asm/pSeries_reconfig.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
#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 */

arch/powerpc/include/asm/rtas.h

+5 −0
Original line number Diff line number Diff line
@@ -353,8 +353,13 @@ static inline int page_is_rtas_user_buf(unsigned long pfn) 
		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 *, ...);

arch/powerpc/kernel/rtas.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <asm/time.h>

#include <asm/mmu.h>

#include <asm/topology.h>

#include <asm/pSeries_reconfig.h>



struct rtas_t rtas = {

	.lock = __ARCH_SPIN_LOCK_UNLOCKED

arch/powerpc/platforms/pseries/smp.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <asm/cputable.h>

#include <asm/firmware.h>

#include <asm/rtas.h>

#include <asm/pSeries_reconfig.h>

#include <asm/mpic.h>

#include <asm/vdso_datapage.h>

#include <asm/cputhreads.h>