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

Commit d7867959 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

powerpc: iSeries build fixes 



log_plpar_hcall_return is only used on PPC_PSERIES, so move
it closer to its users and inside ifdef CONFIG_PPC_PSERIES.

remove the last vestiges of systemcfg in iSeries.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 868accb7

arch/powerpc/kernel/lparcfg.c

+25 −26
Original line number Diff line number Diff line
@@ -42,32 +42,6 @@ 


/* #define LPARCFG_DEBUG */



/* find a better place for this function... */

static void log_plpar_hcall_return(unsigned long rc, char *tag)

{

	if (rc == 0)		/* success, return */

		return;

/* check for null tag ? */

	if (rc == H_Hardware)

		printk(KERN_INFO

		       "plpar-hcall (%s) failed with hardware fault\n", tag);

	else if (rc == H_Function)

		printk(KERN_INFO

		       "plpar-hcall (%s) failed; function not allowed\n", tag);

	else if (rc == H_Authority)

		printk(KERN_INFO

		       "plpar-hcall (%s) failed; not authorized to this function\n",

		       tag);

	else if (rc == H_Parameter)

		printk(KERN_INFO "plpar-hcall (%s) failed; Bad parameter(s)\n",

		       tag);

	else

		printk(KERN_INFO

		       "plpar-hcall (%s) failed with unexpected rc(0x%lx)\n",

		       tag, rc);



}



static struct proc_dir_entry *proc_ppc64_lparcfg;

#define LPARCFG_BUFF_SIZE 4096
@@ -172,6 +146,31 @@ static int lparcfg_data(struct seq_file *m, void *v) 
/*

 * Methods used to fetch LPAR data when running on a pSeries platform.

 */

/* find a better place for this function... */

static void log_plpar_hcall_return(unsigned long rc, char *tag)

{

	if (rc == 0)		/* success, return */

		return;

/* check for null tag ? */

	if (rc == H_Hardware)

		printk(KERN_INFO

		       "plpar-hcall (%s) failed with hardware fault\n", tag);

	else if (rc == H_Function)

		printk(KERN_INFO

		       "plpar-hcall (%s) failed; function not allowed\n", tag);

	else if (rc == H_Authority)

		printk(KERN_INFO

		       "plpar-hcall (%s) failed; not authorized to this function\n",

		       tag);

	else if (rc == H_Parameter)

		printk(KERN_INFO "plpar-hcall (%s) failed; Bad parameter(s)\n",

		       tag);

	else

		printk(KERN_INFO

		       "plpar-hcall (%s) failed with unexpected rc(0x%lx)\n",

		       tag, rc);



}



/*

 * H_GET_PPP hcall returns info in 4 parms.

arch/powerpc/platforms/iseries/setup.c

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

#include <asm/iommu.h>

#include <asm/firmware.h>

#include <asm/systemcfg.h>

#include <asm/system.h>

#include <asm/time.h>

#include <asm/paca.h>
@@ -548,8 +547,6 @@ static unsigned long __init build_iSeries_Memory_Map(void) 
 */

static void __init iSeries_setup_arch(void)

{

	unsigned procIx = get_paca()->lppaca.dyn_hv_phys_proc_index;



	if (get_paca()->lppaca.shared_proc) {

		ppc_md.idle_loop = iseries_shared_idle;

		printk(KERN_INFO "Using shared processor idle loop\n");
@@ -565,9 +562,6 @@ static void __init iSeries_setup_arch(void) 
			itVpdAreas.xSlicMaxLogicalProcs);

	printk("Max physical processors = %d\n",

			itVpdAreas.xSlicMaxPhysicalProcs);



	_systemcfg->processor = xIoHriProcessorVpd[procIx].xPVR;

	printk("Processor version = %x\n", _systemcfg->processor);

}



static void iSeries_show_cpuinfo(struct seq_file *m)