Le 24/05/2024 à 09:31, Michael Ellerman a écrit : > Christophe Leroy <christophe.leroy@xxxxxxxxxx> writes: >> When it is a nohash/64 it can't be anything else than >> CONFIG_PPC_E500 so remove the #ifdef as they are always true. > > I have a series doing some similar cleanups, I'll post it. We can decide > whether to merge it before your series or combine them or whatever. > Great. I'll apply my series on top. Note that it doesn't apply cleanly on merge branch (47279113c5d0), a 3-way merge is needed: $ LANG= git am -3 ~/Téléchargements/1-6-powerpc-64e-Remove-unused-IBM-HTW-code.patch Applying: powerpc/64e: Remove unused IBM HTW code Applying: powerpc/64e: Split out nohash Book3E 64-bit code Using index info to reconstruct a base tree... M arch/powerpc/mm/nohash/Makefile .git/rebase-apply/patch:554: trailing whitespace. def->shift = 0; warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging arch/powerpc/mm/nohash/Makefile Applying: powerpc/64e: Drop E500 ifdefs in 64-bit code Applying: powerpc/64e: Drop MMU_FTR_TYPE_FSL_E checks in 64-bit code Applying: powerpc/64e: Consolidate TLB miss handler patching Applying: powerpc/64e: Drop unused TLB miss handlers Thanks Christophe
