linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Anshuman Khandual <khandual@linux.vnet.ibm.com>
To: linuxppc-dev@ozlabs.org
Cc: mpe@ellerman.id.au, mikey@neuling.org
Subject: [PATCH 2/8] powerpc/slb: Rename all the 'slot' occurrences to 'entry'
Date: Wed, 29 Jul 2015 12:39:59 +0530	[thread overview]
Message-ID: <1438153805-31828-2-git-send-email-khandual@linux.vnet.ibm.com> (raw)
In-Reply-To: <1438153805-31828-1-git-send-email-khandual@linux.vnet.ibm.com>

These are essentially SLB individual slots with entries what we are
dealing with in these functions. Usage of both 'entry' and 'slot'
synonyms makes it real confusing sometimes. This patch makes it
uniform across the file by replacing all those 'slot's with 'entry's.

Signed-off-by: Anshuman Khandual <khandual@linux.vnet.ibm.com>
---
 arch/powerpc/mm/slb.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index 62fafb3..faf9f0c 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -41,9 +41,9 @@ static void slb_allocate(unsigned long ea)
 	(((ssize) == MMU_SEGSIZE_256M)? ESID_MASK: ESID_MASK_1T)
 
 static inline unsigned long mk_esid_data(unsigned long ea, int ssize,
-					 unsigned long slot)
+					 unsigned long entry)
 {
-	return (ea & slb_esid_mask(ssize)) | SLB_ESID_V | slot;
+	return (ea & slb_esid_mask(ssize)) | SLB_ESID_V | entry;
 }
 
 static inline unsigned long mk_vsid_data(unsigned long ea, int ssize,
@@ -308,12 +308,11 @@ void slb_initialize(void)
 	lflags = SLB_VSID_KERNEL | linear_llp;
 	vflags = SLB_VSID_KERNEL | vmalloc_llp;
 
-	/* Invalidate the entire SLB (even slot 0) & all the ERATS */
+	/* Invalidate the entire SLB (even entry 0) & all the ERATS */
 	asm volatile("isync":::"memory");
 	asm volatile("slbmte  %0,%0"::"r" (0) : "memory");
 	asm volatile("isync; slbia; isync":::"memory");
 	create_shadowed_slbe(PAGE_OFFSET, mmu_kernel_ssize, lflags, 0);
-
 	create_shadowed_slbe(VMALLOC_START, mmu_kernel_ssize, vflags, 1);
 
 	/* For the boot cpu, we're running on the stack in init_thread_union,
-- 
2.1.0

  reply	other threads:[~2015-07-29  7:10 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-29  7:09 [PATCH 1/8] powerpc/slb: Remove a duplicate extern variable Anshuman Khandual
2015-07-29  7:09 ` Anshuman Khandual [this message]
2015-08-13  1:44   ` [2/8] powerpc/slb: Rename all the 'slot' occurrences to 'entry' Michael Ellerman
2015-07-29  7:10 ` [PATCH 3/8] powerpc/slb: Define macros for the bolted slots Anshuman Khandual
2015-07-29  7:10 ` [PATCH 4/8] powerpc/slb: Add some helper functions to improve modularization Anshuman Khandual
2015-08-12  4:11   ` [4/8] " Michael Ellerman
2015-08-12  6:36     ` Anshuman Khandual
2015-07-29  7:10 ` [PATCH 5/8] powerpc/slb: Add documentation to runtime patching of SLB encoding Anshuman Khandual
2015-08-12  5:12   ` [5/8] " Michael Ellerman
2015-08-13  1:44   ` Michael Ellerman
2015-07-29  7:10 ` [PATCH 6/8] powerpc/prom: Simplify the logic while fetching SLB size Anshuman Khandual
2015-08-13  1:44   ` [6/8] " Michael Ellerman
2015-07-29  7:10 ` [PATCH 7/8] powerpc/xmon: Drop the 'valid' variable completely in 'dump_segments' Anshuman Khandual
2015-08-13  1:44   ` [7/8] " Michael Ellerman
2015-07-29  7:10 ` [PATCH 8/8] powerpc/xmon: Add some more elements to the existing PACA dump list Anshuman Khandual
2015-08-12  6:05   ` Michael Ellerman
2015-08-12  6:27     ` Anshuman Khandual
2015-08-13  1:44 ` [1/8] powerpc/slb: Remove a duplicate extern variable Michael Ellerman

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=1438153805-31828-2-git-send-email-khandual@linux.vnet.ibm.com \
    --to=khandual@linux.vnet.ibm.com \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=mikey@neuling.org \
    --cc=mpe@ellerman.id.au \
    /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).