diff options
| author | Anton Blanchard <anton@samba.org> | 2012-04-10 16:20:54 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-30 15:37:15 +1000 |
| commit | cf8a056a2226754087320541fb4de743cc81cd2e (patch) | |
| tree | f54a23c5df0b812506148881bbaa0d4d257d1f86 | |
| parent | fd6c40f3b00a1e76d6a920cb6591907c53450afc (diff) | |
| download | linux-3.10-cf8a056a2226754087320541fb4de743cc81cd2e.tar.gz linux-3.10-cf8a056a2226754087320541fb4de743cc81cd2e.tar.bz2 linux-3.10-cf8a056a2226754087320541fb4de743cc81cd2e.zip | |
powerpc: Clean up lppaca->cede_latency_hint
We have a union containing fields from the old iseries hypervisor
that has been reused for the cede latency hint. Since we no
longer support iseries, remove the union completely.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/include/asm/lppaca.h | 16 | ||||
| -rw-r--r-- | arch/powerpc/platforms/pseries/plpar_wrappers.h | 4 |
2 files changed, 5 insertions, 15 deletions
diff --git a/arch/powerpc/include/asm/lppaca.h b/arch/powerpc/include/asm/lppaca.h index a76254af0aa..bc4e3755294 100644 --- a/arch/powerpc/include/asm/lppaca.h +++ b/arch/powerpc/include/asm/lppaca.h @@ -107,19 +107,9 @@ struct lppaca { // pass the target SRR0/1 from SLIC to PLIC on a SetAsrAndRfid. u64 saved_srr0; // Saved SRR0 x10-x17 u64 saved_srr1; // Saved SRR1 x18-x1F - - // Used to pass parms from the OS to PLIC for SetAsrAndRfid - u64 saved_gpr3; // Saved GPR3 x20-x27 - u64 saved_gpr4; // Saved GPR4 x28-x2F - union { - u64 saved_gpr5; /* Saved GPR5 x30-x37 */ - struct { - u8 cede_latency_hint; /* x30 */ - u8 reserved[7]; /* x31-x36 */ - } fields; - } gpr5_dword; - - + u64 reserved5[2]; /* x20-x2F */ + u8 cede_latency_hint; /* x30 */ + u8 reserved[7]; /* x31-x37 */ u8 dtl_enable_mask; // Dispatch Trace Log mask x38-x38 u8 donate_dedicated_cpu; // Donate dedicated CPU cycles x39-x39 u8 fpregs_in_use; // FP regs in use x3A-x3A diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h index 342797fc0f9..13e8cc43adf 100644 --- a/arch/powerpc/platforms/pseries/plpar_wrappers.h +++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h @@ -22,12 +22,12 @@ static inline long poll_pending(void) static inline u8 get_cede_latency_hint(void) { - return get_lppaca()->gpr5_dword.fields.cede_latency_hint; + return get_lppaca()->cede_latency_hint; } static inline void set_cede_latency_hint(u8 latency_hint) { - get_lppaca()->gpr5_dword.fields.cede_latency_hint = latency_hint; + get_lppaca()->cede_latency_hint = latency_hint; } static inline long cede_processor(void) |