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

Commit 2249ca9d authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Various UP build fixes 



Mostly this involves adding #include <asm/smp.h>, since that defines
things like boot_cpuid[_phys] and [gs]et_hard_smp_processor_id, which
are SMP-related but still needed on UP.  This incorporates fixes
posted by Olof Johansson and Heikki Lindholm.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent dcad47fc

arch/powerpc/kernel/rtas.c

+0 −2
Original line number Diff line number Diff line
@@ -608,7 +608,6 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs) 
	return 0;

}



#ifdef CONFIG_SMP

/* This version can't take the spinlock, because it never returns */



struct rtas_args rtas_stop_self_args = {
@@ -633,7 +632,6 @@ void rtas_stop_self(void) 


	panic("Alas, I survived.\n");

}

#endif



/*

 * Call early during boot, before mem init or bootmem, to retreive the RTAS

arch/powerpc/kernel/time.c

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

#include <asm/irq.h>

#include <asm/div64.h>

#include <asm/smp.h>

#ifdef CONFIG_PPC64

#include <asm/systemcfg.h>

#include <asm/firmware.h>
@@ -118,10 +119,6 @@ static unsigned adjusting_time = 0; 
unsigned long ppc_proc_freq;

unsigned long ppc_tb_freq;



#ifdef CONFIG_PPC32	/* XXX for now */

#define boot_cpuid	0

#endif



u64 tb_last_jiffy __cacheline_aligned_in_smp;

unsigned long tb_last_stamp;

arch/powerpc/lib/locks.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES)

#include <asm/hvcall.h>

#include <asm/iseries/hv_call.h>

#include <asm/smp.h>



void __spin_yield(raw_spinlock_t *lock)

{

arch/powerpc/mm/numa.c

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

#include <asm/abs_addr.h>

#include <asm/system.h>

#include <asm/smp.h>



static int numa_enabled = 1;

arch/powerpc/platforms/pseries/iommu.c

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

#include <asm/tce.h>

#include <asm/ppc-pci.h>

#include <asm/udbg.h>



#include "plpar_wrappers.h"