From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIsbJ-0004zU-PB for qemu-devel@nongnu.org; Fri, 01 Jul 2016 03:11:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bIsbE-0007Bs-Kn for qemu-devel@nongnu.org; Fri, 01 Jul 2016 03:10:56 -0400 Received: from 5.mo53.mail-out.ovh.net ([46.105.48.2]:49650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIsbE-0007BL-Ey for qemu-devel@nongnu.org; Fri, 01 Jul 2016 03:10:52 -0400 Received: from player158.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo53.mail-out.ovh.net (Postfix) with ESMTP id 8E0E6FF8A15 for ; Fri, 1 Jul 2016 09:10:51 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Fri, 1 Jul 2016 09:10:12 +0200 Message-Id: <1467357013-4039-4-git-send-email-clg@kaod.org> In-Reply-To: <1467357013-4039-1-git-send-email-clg@kaod.org> References: <1467357013-4039-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 3/4] ppc: simplify ppc_hash64_pteg_search() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: Alexander Graf , Benjamin Herrenschmidt , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= The page shift parameter is never used. Let's remove it. Signed-off-by: C=C3=A9dric Le Goater --- target-ppc/mmu-hash64.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/target-ppc/mmu-hash64.c b/target-ppc/mmu-hash64.c index fdaff9e874ba..7ef45ee53bf5 100644 --- a/target-ppc/mmu-hash64.c +++ b/target-ppc/mmu-hash64.c @@ -451,8 +451,8 @@ void ppc_hash64_stop_access(PowerPCCPU *cpu, uint64_t= token) } =20 static hwaddr ppc_hash64_pteg_search(PowerPCCPU *cpu, hwaddr hash, - uint32_t slb_pshift, bool secondary= , - target_ulong ptem, ppc_hash_pte64_t= *pte) + bool secondary, target_ulong ptem, + ppc_hash_pte64_t *pte) { CPUPPCState *env =3D &cpu->env; int i; @@ -532,8 +532,7 @@ static hwaddr ppc_hash64_htab_lookup(PowerPCCPU *cpu, " vsid=3D" TARGET_FMT_lx " ptem=3D" TARGET_FMT_lx " hash=3D" TARGET_FMT_plx "\n", env->htab_base, env->htab_mask, vsid, ptem, hash); - pte_offset =3D ppc_hash64_pteg_search(cpu, hash, slb->sps->page_shif= t, - 0, ptem, pte); + pte_offset =3D ppc_hash64_pteg_search(cpu, hash, 0, ptem, pte); =20 if (pte_offset =3D=3D -1) { /* Secondary PTEG lookup */ @@ -543,8 +542,7 @@ static hwaddr ppc_hash64_htab_lookup(PowerPCCPU *cpu, " hash=3D" TARGET_FMT_plx "\n", env->htab_base, env->htab_mask, vsid, ptem, ~hash); =20 - pte_offset =3D ppc_hash64_pteg_search(cpu, ~hash, slb->sps->page= _shift, 1, - ptem, pte); + pte_offset =3D ppc_hash64_pteg_search(cpu, ~hash, 1, ptem, pte); } =20 return pte_offset; --=20 2.1.4