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

Commit 582d3e09 authored by Kyle Moffett's avatar Kyle Moffett Committed by Benjamin Herrenschmidt
Browse files

powerpc/85xx: Move mpc85xx_smp_init() decl to a new "smp.h" 



This removes a bunch of "extern" declarations and CONFIG_SMP ifdefs.

Signed-off-by: default avatarKyle Moffett <Kyle.D.Moffett@boeing.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent fa8cbaaf

arch/powerpc/platforms/85xx/corenet_ds.c

+1 −6
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/of_platform.h>

#include <sysdev/fsl_soc.h>

#include <sysdev/fsl_pci.h>

#include "smp.h"



void __init corenet_ds_pic_init(void)

{
@@ -65,10 +66,6 @@ void __init corenet_ds_pic_init(void) 
/*

 * Setup the architecture

 */

#ifdef CONFIG_SMP

void __init mpc85xx_smp_init(void);

#endif



void __init corenet_ds_setup_arch(void)

{

#ifdef CONFIG_PCI
@@ -77,9 +74,7 @@ void __init corenet_ds_setup_arch(void) 
#endif

	dma_addr_t max = 0xffffffff;



#ifdef CONFIG_SMP

	mpc85xx_smp_init();

#endif



#ifdef CONFIG_PCI

	for_each_node_by_type(np, "pci") {

arch/powerpc/platforms/85xx/mpc85xx_ds.c

+1 −5
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 


#include <sysdev/fsl_soc.h>

#include <sysdev/fsl_pci.h>

#include "smp.h"



#include "mpc85xx.h"
@@ -154,9 +155,6 @@ static int mpc85xx_exclude_device(struct pci_controller *hose, 
/*

 * Setup the architecture

 */

#ifdef CONFIG_SMP

extern void __init mpc85xx_smp_init(void);

#endif

static void __init mpc85xx_ds_setup_arch(void)

{

#ifdef CONFIG_PCI
@@ -189,9 +187,7 @@ static void __init mpc85xx_ds_setup_arch(void) 
	ppc_md.pci_exclude_device = mpc85xx_exclude_device;

#endif



#ifdef CONFIG_SMP

	mpc85xx_smp_init();

#endif



#ifdef CONFIG_SWIOTLB

	if (memblock_end_of_DRAM() > max) {

arch/powerpc/platforms/85xx/mpc85xx_mds.c

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

#include <asm/mpic.h>

#include <asm/swiotlb.h>

#include "smp.h"



#include "mpc85xx.h"
@@ -155,10 +156,6 @@ static int mpc8568_mds_phy_fixups(struct phy_device *phydev) 
 * Setup the architecture

 *

 */

#ifdef CONFIG_SMP

extern void __init mpc85xx_smp_init(void);

#endif



#ifdef CONFIG_QUICC_ENGINE

static void __init mpc85xx_mds_reset_ucc_phys(void)

{
@@ -363,9 +360,7 @@ static void __init mpc85xx_mds_setup_arch(void) 
	}

#endif



#ifdef CONFIG_SMP

	mpc85xx_smp_init();

#endif



	mpc85xx_mds_qe_init();

arch/powerpc/platforms/85xx/mpc85xx_rdb.c

+1 −6
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include <sysdev/fsl_soc.h>

#include <sysdev/fsl_pci.h>

#include "smp.h"



#include "mpc85xx.h"
@@ -84,9 +85,6 @@ void __init mpc85xx_rdb_pic_init(void) 
/*

 * Setup the architecture

 */

#ifdef CONFIG_SMP

extern void __init mpc85xx_smp_init(void);

#endif

static void __init mpc85xx_rdb_setup_arch(void)

{

#ifdef CONFIG_PCI
@@ -104,10 +102,7 @@ static void __init mpc85xx_rdb_setup_arch(void) 


#endif



#ifdef CONFIG_SMP

	mpc85xx_smp_init();

#endif



	printk(KERN_INFO "MPC85xx RDB board from Freescale Semiconductor\n");

}

arch/powerpc/platforms/85xx/p1022_ds.c

+1 −6
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <sysdev/fsl_soc.h>

#include <sysdev/fsl_pci.h>

#include <asm/fsl_guts.h>

#include "smp.h"



#include "mpc85xx.h"
@@ -268,10 +269,6 @@ void __init p1022_ds_pic_init(void) 
	mpic_init(mpic);

}



#ifdef CONFIG_SMP

void __init mpc85xx_smp_init(void);

#endif



/*

 * Setup the architecture

 */
@@ -311,9 +308,7 @@ static void __init p1022_ds_setup_arch(void) 
	diu_ops.valid_monitor_port	= p1022ds_valid_monitor_port;

#endif



#ifdef CONFIG_SMP

	mpc85xx_smp_init();

#endif



#ifdef CONFIG_SWIOTLB

	if (memblock_end_of_DRAM() > max) {