public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230823055317.751786-3-mpe@ellerman.id.au
This commit is contained in:
Michael Ellerman 2023-08-23 15:53:16 +10:00
parent 9a6c05fe9a
commit 1aa0006676
7 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/powerpc/include/asm/lppaca.h
View file

@ -112,6 +112,10 @@ static inline bool lppaca_shared_proc(struct lppaca *l)
return !!(l->__old_status & LPPACA_OLD_SHARED_PROC); 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 * SLB shadow buffer structure as defined in the PAPR. The save_area
* contains adjacent ESID and VSID pairs for each shadowed SLB. The * contains adjacent ESID and VSID pairs for each shadowed SLB. The

6
arch/powerpc/include/asm/paca.h
View file

@ -15,7 +15,6 @@
#include <linux/cache.h> #include <linux/cache.h>
#include <linux/string.h> #include <linux/string.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/lppaca.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/page.h> #include <asm/page.h>
#ifdef CONFIG_PPC_BOOK3E_64 #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 #define get_paca() local_paca
#endif #endif
#ifdef CONFIG_PPC_PSERIES
#define get_lppaca() (get_paca()->lppaca_ptr)
#endif
#define get_slb_shadow() (get_paca()->slb_shadow_ptr) #define get_slb_shadow() (get_paca()->slb_shadow_ptr)
struct task_struct; struct task_struct;
struct rtas_args; struct rtas_args;
struct lppaca;
/* /*
* Defines the layout of the paca. * Defines the layout of the paca.

1
arch/powerpc/include/asm/paravirt.h
View file

@ -6,6 +6,7 @@
#include <asm/smp.h> #include <asm/smp.h>
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/lppaca.h>
#include <asm/hvcall.h> #include <asm/hvcall.h>
#endif #endif

1
arch/powerpc/include/asm/plpar_wrappers.h
View file

@ -9,6 +9,7 @@
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/lppaca.h>
#include <asm/page.h> #include <asm/page.h>
static inline long poll_pending(void) static inline long poll_pending(void)

1
arch/powerpc/kvm/book3s_hv_ras.c
View file

@ -9,6 +9,7 @@
#include <linux/kvm.h> #include <linux/kvm.h>
#include <linux/kvm_host.h> #include <linux/kvm_host.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/lppaca.h>
#include <asm/opal.h> #include <asm/opal.h>
#include <asm/mce.h> #include <asm/mce.h>
#include <asm/machdep.h> #include <asm/machdep.h>

1
arch/powerpc/mm/book3s64/slb.c
View file

@ -13,6 +13,7 @@
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/lppaca.h>
#include <asm/ppc-opcode.h> #include <asm/ppc-opcode.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>

1
arch/powerpc/xmon/xmon.c
View file

@ -58,6 +58,7 @@
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/lppaca.h>
#endif #endif
#include "nonstdio.h" #include "nonstdio.h"