Excerpts from Christophe Leroy's message of August 7, 2020 3:15 am: > To make it more readable, separate page_fault_is_write() and > page_fault_is_bad() > to avoir several levels of #ifdefs
Reviewed-by: Nicholas Piggin <npig...@gmail.com> > Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu> > --- > arch/powerpc/mm/fault.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c > index 2efa34d7e644..9ef9ee244f72 100644 > --- a/arch/powerpc/mm/fault.c > +++ b/arch/powerpc/mm/fault.c > @@ -363,17 +363,19 @@ static void sanity_check_fault(bool is_write, bool > is_user, > */ > #if (defined(CONFIG_4xx) || defined(CONFIG_BOOKE)) > #define page_fault_is_write(__err) ((__err) & ESR_DST) > -#define page_fault_is_bad(__err) (0) > #else > #define page_fault_is_write(__err) ((__err) & DSISR_ISSTORE) > -#if defined(CONFIG_PPC_8xx) > +#endif > + > +#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) > +#define page_fault_is_bad(__err) (0) > +#elif defined(CONFIG_PPC_8xx) > #define page_fault_is_bad(__err) ((__err) & DSISR_NOEXEC_OR_G) > #elif defined(CONFIG_PPC64) > #define page_fault_is_bad(__err) ((__err) & DSISR_BAD_FAULT_64S) > #else > #define page_fault_is_bad(__err) ((__err) & DSISR_BAD_FAULT_32S) > #endif > -#endif > > /* > * For 600- and 800-family processors, the error_code parameter is DSISR > -- > 2.25.0 > >
