[PATCH 1/3] powerpc/lib/sstep: Use l1_dcache_bytes() instead of opencoding

[Christophe Leroy]

Don't opencode dcache size retrieval based on whether that's ppc32 or ppc64.

Use l1_dcache_bytes()

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
 arch/powerpc/lib/sstep.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index a94b0cd0bdc5..b7316d697d80 100644
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -1065,14 +1065,11 @@ static int __emulate_dcbz(unsigned long ea)
 int emulate_dcbz(unsigned long ea, struct pt_regs *regs)
 {
        int err;
-       unsigned long size;
+       unsigned long size = l1_dcache_bytes();
 
 #ifdef __powerpc64__
-       size = ppc64_caches.l1d.block_size;
        if (!(regs->msr & MSR_64BIT))
                ea &= 0xffffffffUL;
-#else
-       size = L1_CACHE_BYTES;
 #endif
        ea &= ~(size - 1);
        if (!address_ok(regs, ea, size))
-- 
2.33.1