From cf611e38423fb87d0b11c4148ae4fdc98e866c03 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Tue, 10 Apr 2012 16:20:54 +0000 Subject: [PATCH] --- yaml --- r: 305339 b: refs/heads/master c: cf8a056a2226754087320541fb4de743cc81cd2e h: refs/heads/master i: 305337: cafe12ff76bbe52ae3f3e97c8b3056fc2b01597c 305335: fd11ecf0b5b2dea7dcba09958b45e3c6c96c4bdf v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/lppaca.h | 16 +++------------- .../powerpc/platforms/pseries/plpar_wrappers.h | 4 ++-- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 227401d829a8..77efba156b87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd6c40f3b00a1e76d6a920cb6591907c53450afc +refs/heads/master: cf8a056a2226754087320541fb4de743cc81cd2e diff --git a/trunk/arch/powerpc/include/asm/lppaca.h b/trunk/arch/powerpc/include/asm/lppaca.h index a76254af0aaa..bc4e37552948 100644 --- a/trunk/arch/powerpc/include/asm/lppaca.h +++ b/trunk/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/trunk/arch/powerpc/platforms/pseries/plpar_wrappers.h b/trunk/arch/powerpc/platforms/pseries/plpar_wrappers.h index 342797fc0f9c..13e8cc43adf7 100644 --- a/trunk/arch/powerpc/platforms/pseries/plpar_wrappers.h +++ b/trunk/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)