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

Commit ab83dc79 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/xmon: Move empty plpar_set_ciabr() into plpar_wrappers.h 



Now that plpar_wrappers.h has an #ifdef PSERIES we can move the empty
version of plpar_set_ciabr() which xmon wants into there.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 7c09c186

arch/powerpc/include/asm/plpar_wrappers.h

+6 −0
Original line number Diff line number Diff line
@@ -334,6 +334,12 @@ static inline long plpar_get_cpu_characteristics(struct h_cpu_char_result *p) 
	return rc;

}



#else /* !CONFIG_PPC_PSERIES */



static inline long plpar_set_ciabr(unsigned long ciabr)

{

	return 0;

}

#endif /* CONFIG_PPC_PSERIES */



#endif /* _ASM_POWERPC_PLPAR_WRAPPERS_H */

arch/powerpc/xmon/xmon.c

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

#include <asm/mmu.h>

#include <asm/mmu_context.h>

#include <asm/plpar_wrappers.h>

#include <asm/cputable.h>

#include <asm/rtas.h>

#include <asm/sstep.h>
@@ -61,12 +62,6 @@ 
#include <asm/paca.h>

#endif



#if defined(CONFIG_PPC_SPLPAR)

#include <asm/plpar_wrappers.h>

#else

static inline long plpar_set_ciabr(unsigned long ciabr) {return 0; };

#endif



#include "nonstdio.h"

#include "dis-asm.h"