From: Anshuman Khandual <khandual@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Cc: mikey@neuling.org, anton@samba.org, shuahkh@osg.samsung.com,
mpe@ellerman.id.au
Subject: [PATCH V5 03/13] powerpc, offset: Change PACA_DSCR to PACA_DSCR_DEFAULT
Date: Thu, 21 May 2015 12:13:03 +0530 [thread overview]
Message-ID: <1432190593-17253-4-git-send-email-khandual@linux.vnet.ibm.com> (raw)
In-Reply-To: <1432190593-17253-1-git-send-email-khandual@linux.vnet.ibm.com>
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: Anshuman Khandual <khandual@linux.vnet.ibm.com>
---
arch/powerpc/kernel/asm-offsets.c | 2 +-
arch/powerpc/kernel/entry_64.S | 2 +-
arch/powerpc/kernel/tm.S | 4 ++--
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 0034b6b..9823057 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -247,7 +247,7 @@ int main(void)
#endif
DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id));
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_USER, offsetof(struct paca_struct, starttime_user));
DEFINE(PACA_USER_TIME, offsetof(struct paca_struct, user_time));
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index afbc200..278888e 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -556,7 +556,7 @@ BEGIN_FTR_SECTION
ld r0,THREAD_DSCR(r4)
cmpwi r6,0
bne 1f
- ld r0,PACA_DSCR(r13)
+ ld r0,PACA_DSCR_DEFAULT(r13)
1:
BEGIN_FTR_SECTION_NESTED(70)
mfspr r8, SPRN_FSCR
diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S
index 5754b22..bf8f34a 100644
--- a/arch/powerpc/kernel/tm.S
+++ b/arch/powerpc/kernel/tm.S
@@ -293,7 +293,7 @@ dont_backup_fp:
ld r2, STK_GOT(r1)
/* Load CPU's default DSCR */
- ld r0, PACA_DSCR(r13)
+ ld r0, PACA_DSCR_DEFAULT(r13)
mtspr SPRN_DSCR, r0
blr
@@ -473,7 +473,7 @@ restore_gprs:
ld r2, STK_GOT(r1)
/* Load CPU's default DSCR */
- ld r0, PACA_DSCR(r13)
+ ld r0, PACA_DSCR_DEFAULT(r13)
mtspr SPRN_DSCR, r0
blr
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 4d70df2..faa86e9 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -324,7 +324,7 @@ kvm_start_guest:
kvm_secondary_got_guest:
/* Set HSTATE_DSCR(r13) to something sensible */
- ld r6, PACA_DSCR(r13)
+ ld r6, PACA_DSCR_DEFAULT(r13)
std r6, HSTATE_DSCR(r13)
/* Order load of vcore, ptid etc. after load of vcpu */
--
2.1.0
next prev parent reply other threads:[~2015-05-21 6:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-21 6:43 [PATCH V5 00/13] POWER DSCR fixes, improvements, docs and tests Anshuman Khandual
2015-05-21 6:43 ` [PATCH V5 01/13] powerpc: Fix handling of DSCR related facility unavailable exception Anshuman Khandual
2015-05-21 6:43 ` [PATCH V5 02/13] powerpc, process: Remove the unused extern dscr_default Anshuman Khandual
2015-05-21 6:43 ` Anshuman Khandual [this message]
2015-05-21 6:43 ` [PATCH V5 04/13] powerpc, dscr: Added some in-code documentation Anshuman Khandual
2015-05-21 6:43 ` [PATCH V5 05/13] documentation, powerpc: Add documentation for DSCR support Anshuman Khandual
2015-05-21 6:43 ` [PATCH V5 06/13] selftests, powerpc: Add test for system wide DSCR default Anshuman Khandual
2015-05-21 6:43 ` [PATCH V5 07/13] selftests, powerpc: Add test for explicitly changing DSCR value Anshuman Khandual
2015-05-21 6:43 ` [PATCH V5 08/13] selftests, powerpc: Add test for DSCR SPR numbers Anshuman Khandual
2015-05-21 6:43 ` [PATCH V5 09/13] selftests, powerpc: Add test for DSCR value inheritence across fork Anshuman Khandual
2015-05-21 6:43 ` [PATCH V5 10/13] selftests, powerpc: Add test for DSCR inheritence across fork & exec Anshuman Khandual
2015-05-21 6:43 ` [PATCH V5 11/13] selftests, powerpc: Add test for all DSCR sysfs interfaces Anshuman Khandual
2015-05-21 6:43 ` [PATCH V5 12/13] selftests, powerpc: Add thread based stress test for " Anshuman Khandual
2015-06-03 8:44 ` Anshuman Khandual
2015-05-21 6:43 ` [PATCH V5 13/13] selftests, powerpc: Add gitignore file for the new DSCR tests Anshuman Khandual
2015-05-25 8:38 ` [PATCH V5 00/13] POWER DSCR fixes, improvements, docs and tests Anshuman Khandual
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1432190593-17253-4-git-send-email-khandual@linux.vnet.ibm.com \
--to=khandual@linux.vnet.ibm.com \
--cc=anton@samba.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=shuahkh@osg.samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).