Skip to contentSkip to conversation

powerpc: fix "sz" set but not used

PATCH Applied Qian Cai 3 participants 3 messages Feb 28, 2019 – Mar 4, 2019 PowerPC

lore
Share & tools
lore

Qian Cai

author
#0 lore raw

PATCH 1/1 powerpc: fix "sz" set but not used

arch/powerpc/mm/hugetlbpage-hash64.c: In function '__hash_page_huge':
arch/powerpc/mm/hugetlbpage-hash64.c:29:28: warning: variable 'sz' set but not used [-Wunused-but-set-variable]

---
 arch/powerpc/mm/hugetlbpage-hash64.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/powerpc/mm/hugetlbpage-hash64.c +1 -2
index 2e6a8f9345d3..f6b09edc5e6e 100644
@@ -26,7 +26,7 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid,
 	real_pte_t rpte;
 	unsigned long vpn;
 	unsigned long old_pte, new_pte;
-	unsigned long rflags, pa, sz;
+	unsigned long rflags, pa;
 	long slot, offset;
 
 	BUG_ON(shift != mmu_psize_defs[mmu_psize].shift);
@@ -73,7 +73,6 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid,
 		offset = PTRS_PER_PMD;
 	rpte = __real_pte(__pte(old_pte), ptep, offset);
 
-	sz = ((1UL) << shift);
 	if (!cpu_has_feature(CPU_FTR_COHERENT_ICACHE))
 		/* No CPU has hugepages but lacks no execute, so we
 		 * don't need to worry about that case */
Signature · 1 line
2.17.2 (Apple Git-113)
reviewer Applied
#1 lore raw
Quoted 3 lines · Qian Cai

arch/powerpc/mm/hugetlbpage-hash64.c: In function '__hash_page_huge':
arch/powerpc/mm/hugetlbpage-hash64.c:29:28: warning: variable 'sz' set but not used [-Wunused-but-set-variable]

It's always nice to know *why* it's not used.

It's unlikely, but not impossible, that it's a bug that the variable is not used.

To find out why:

  $ git log --oneline -S sz arch/powerpc/mm/hugetlbpage-hash64.c
  0895ecda7942 powerpc/mm: Bring hugepage PTE accessor functions back into sync with normal accessors
  883a3e523672 powerpc/mm: Split hash MMU specific hugepage code into a new file

Then we look at those, and see the the first one did:

@@ -89,8 +62,7 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid,
if (!cpu_has_feature(CPU_FTR_COHERENT_ICACHE))
/* No CPU has hugepages but lacks no execute, so we
* don't need to worry about that case */
- rflags = hash_huge_page_do_lazy_icache(rflags, __pte(old_pte),
- trap, sz);
+ rflags = hash_page_do_lazy_icache(rflags, __pte(old_pte), trap);

And if you read the commit log it's pretty clear the change was deliberate and so sz should indeed be removed.

I've applied this as-is, no need to send a v2.

cheers

Quoted 23 lines
arch/powerpc/mm/hugetlbpage-hash64.c +1 -2
index 2e6a8f9345d3..f6b09edc5e6e 100644
@@ -26,7 +26,7 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid,
 	real_pte_t rpte;
 	unsigned long vpn;
 	unsigned long old_pte, new_pte;
-	unsigned long rflags, pa, sz;
+	unsigned long rflags, pa;
 	long slot, offset;
 
 	BUG_ON(shift != mmu_psize_defs[mmu_psize].shift);
@@ -73,7 +73,6 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid,
 		offset = PTRS_PER_PMD;
 	rpte = __real_pte(__pte(old_pte), ptep, offset);
 
-	sz = ((1UL) << shift);
 	if (!cpu_has_feature(CPU_FTR_COHERENT_ICACHE))
 		/* No CPU has hugepages but lacks no execute, so we
 		 * don't need to worry about that case */
Signature · 1 line
2.17.2 (Apple Git-113)