Commit 1aa00066 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc: Don't include lppaca.h in paca.h 



By adding a forward declaration for struct lppaca we can untangle paca.h
and lppaca.h. Also move get_lppaca() into lppaca.h for consistency.

Add includes of lppaca.h to some files that need it.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230823055317.751786-3-mpe@ellerman.id.au
parent 9a6c05fe

arch/powerpc/include/asm/lppaca.h

+4 −0
Original line number Diff line number Diff line
@@ -112,6 +112,10 @@ static inline bool lppaca_shared_proc(struct lppaca *l) 
	return !!(l->__old_status & LPPACA_OLD_SHARED_PROC);

}



#ifdef CONFIG_PPC_PSERIES

#define get_lppaca()	(get_paca()->lppaca_ptr)

#endif



/*

 * SLB shadow buffer structure as defined in the PAPR.  The save_area

 * contains adjacent ESID and VSID pairs for each shadowed SLB.  The

arch/powerpc/include/asm/paca.h

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

#include <linux/string.h>

#include <asm/types.h>

#include <asm/lppaca.h>

#include <asm/mmu.h>

#include <asm/page.h>

#ifdef CONFIG_PPC_BOOK3E_64
@@ -47,14 +46,11 @@ extern unsigned int debug_smp_processor_id(void); /* from linux/smp.h */ 
#define get_paca()	local_paca

#endif



#ifdef CONFIG_PPC_PSERIES

#define get_lppaca()	(get_paca()->lppaca_ptr)

#endif



#define get_slb_shadow()	(get_paca()->slb_shadow_ptr)



struct task_struct;

struct rtas_args;

struct lppaca;



/*

 * Defines the layout of the paca.

arch/powerpc/include/asm/paravirt.h

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

#ifdef CONFIG_PPC64

#include <asm/paca.h>

#include <asm/lppaca.h>

#include <asm/hvcall.h>

#endif

arch/powerpc/include/asm/plpar_wrappers.h

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


#include <asm/hvcall.h>

#include <asm/paca.h>

#include <asm/lppaca.h>

#include <asm/page.h>



static inline long poll_pending(void)

arch/powerpc/kvm/book3s_hv_ras.c

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

#include <linux/kvm_host.h>

#include <linux/kernel.h>

#include <asm/lppaca.h>

#include <asm/opal.h>

#include <asm/mce.h>

#include <asm/machdep.h>