Commit 1db36525 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Michael Ellerman

powerpc/kernel: Rename PACA_DSCR to PACA_DSCR_DEFAULT

PACA_DSCR offset macro tracks dscr_default element in the paca
structure. Better change the name of this macro to match that of the
data element it tracks. Makes the code more readable.
Signed-off-by: default avatarAnshuman Khandual <khandual@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 280e1099
...@@ -247,7 +247,7 @@ int main(void) ...@@ -247,7 +247,7 @@ int main(void)
#endif #endif
DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id)); DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id));
DEFINE(PACAKEXECSTATE, offsetof(struct paca_struct, kexec_state)); DEFINE(PACAKEXECSTATE, offsetof(struct paca_struct, kexec_state));
DEFINE(PACA_DSCR, offsetof(struct paca_struct, dscr_default)); DEFINE(PACA_DSCR_DEFAULT, offsetof(struct paca_struct, dscr_default));
DEFINE(PACA_STARTTIME, offsetof(struct paca_struct, starttime)); DEFINE(PACA_STARTTIME, offsetof(struct paca_struct, starttime));
DEFINE(PACA_STARTTIME_USER, offsetof(struct paca_struct, starttime_user)); DEFINE(PACA_STARTTIME_USER, offsetof(struct paca_struct, starttime_user));
DEFINE(PACA_USER_TIME, offsetof(struct paca_struct, user_time)); DEFINE(PACA_USER_TIME, offsetof(struct paca_struct, user_time));
......
...@@ -556,7 +556,7 @@ BEGIN_FTR_SECTION ...@@ -556,7 +556,7 @@ BEGIN_FTR_SECTION
ld r0,THREAD_DSCR(r4) ld r0,THREAD_DSCR(r4)
cmpwi r6,0 cmpwi r6,0
bne 1f bne 1f
ld r0,PACA_DSCR(r13) ld r0,PACA_DSCR_DEFAULT(r13)
1: 1:
BEGIN_FTR_SECTION_NESTED(70) BEGIN_FTR_SECTION_NESTED(70)
mfspr r8, SPRN_FSCR mfspr r8, SPRN_FSCR
......
...@@ -293,7 +293,7 @@ dont_backup_fp: ...@@ -293,7 +293,7 @@ dont_backup_fp:
ld r2, STK_GOT(r1) ld r2, STK_GOT(r1)
/* Load CPU's default DSCR */ /* Load CPU's default DSCR */
ld r0, PACA_DSCR(r13) ld r0, PACA_DSCR_DEFAULT(r13)
mtspr SPRN_DSCR, r0 mtspr SPRN_DSCR, r0
blr blr
...@@ -473,7 +473,7 @@ restore_gprs: ...@@ -473,7 +473,7 @@ restore_gprs:
ld r2, STK_GOT(r1) ld r2, STK_GOT(r1)
/* Load CPU's default DSCR */ /* Load CPU's default DSCR */
ld r0, PACA_DSCR(r13) ld r0, PACA_DSCR_DEFAULT(r13)
mtspr SPRN_DSCR, r0 mtspr SPRN_DSCR, r0
blr blr
......
...@@ -324,7 +324,7 @@ kvm_start_guest: ...@@ -324,7 +324,7 @@ kvm_start_guest:
kvm_secondary_got_guest: kvm_secondary_got_guest:
/* Set HSTATE_DSCR(r13) to something sensible */ /* Set HSTATE_DSCR(r13) to something sensible */
ld r6, PACA_DSCR(r13) ld r6, PACA_DSCR_DEFAULT(r13)
std r6, HSTATE_DSCR(r13) std r6, HSTATE_DSCR(r13)
/* Order load of vcore, ptid etc. after load of vcpu */ /* Order load of vcore, ptid etc. after load of vcpu */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment