On Fri, Apr 15, 2016 at 11:36:51AM +0100, Paul Burton wrote: > asm/pgtable-bits.h is included in 2 assembly files and thus has to > in either of the assembly files that include it. That could do with rewording :-) Otherwise Reviewed-by: James Hogan <james.hogan@xxxxxxxxxx> Cheers James > > Remove the redundant inclusions such that asm/pgtable-bits.h doesn't > need to #ifdef around C code, for cleanliness & and in preparation for > later patches which will add more C. > > Signed-off-by: Paul Burton <paul.burton@xxxxxxxxxx> > --- > > arch/mips/include/asm/pgtable-bits.h | 2 -- > arch/mips/kernel/head.S | 1 - > arch/mips/kernel/r4k_switch.S | 1 - > 3 files changed, 4 deletions(-) > > diff --git a/arch/mips/include/asm/pgtable-bits.h b/arch/mips/include/asm/pgtable-bits.h > index 97b3138..2f40312 100644 > --- a/arch/mips/include/asm/pgtable-bits.h > +++ b/arch/mips/include/asm/pgtable-bits.h > @@ -191,7 +191,6 @@ > */ > > > -#ifndef __ASSEMBLY__ > /* > * pte_to_entrylo converts a page table entry (PTE) into a Mips > * entrylo0/1 value. > @@ -218,7 +217,6 @@ static inline uint64_t pte_to_entrylo(unsigned long pte_val) > > return pte_val >> _PAGE_GLOBAL_SHIFT; > } > -#endif > > /* > * Cache attributes > diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S > index 4e4cc5b..b8fb0ba 100644 > --- a/arch/mips/kernel/head.S > +++ b/arch/mips/kernel/head.S > @@ -21,7 +21,6 @@ > #include <asm/asmmacro.h> > #include <asm/irqflags.h> > #include <asm/regdef.h> > -#include <asm/pgtable-bits.h> > #include <asm/mipsregs.h> > #include <asm/stackframe.h> > > diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S > index 92cd051..2f0a3b2 100644 > --- a/arch/mips/kernel/r4k_switch.S > +++ b/arch/mips/kernel/r4k_switch.S > @@ -15,7 +15,6 @@ > #include <asm/fpregdef.h> > #include <asm/mipsregs.h> > #include <asm/asm-offsets.h> > -#include <asm/pgtable-bits.h> > #include <asm/regdef.h> > #include <asm/stackframe.h> > #include <asm/thread_info.h> > -- > 2.8.0 >
Attachment:
signature.asc
Description: Digital signature
