Commit 253f0d4a authored Apr 19, 2016 by Paul Burton Committed by Ralf Baechle May 13, 2016

MIPS: Remove redundant asm/pgtable-bits.h inclusions



asm/pgtable-bits.h is included in 2 assembly files and thus has to
ifdef around C code, however nothing defined by the header is used
in either of the assembly files that include it.

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@imgtec.com>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Cc: Jonas Gorski <jogo@openwrt.org>
Cc: Alex Smith <alex.smith@imgtec.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/13114/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 14bc2414

arch/mips/include/asm/pgtable-bits.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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

arch/mips/kernel/head.S

+0 −1

Original line number	Diff line number	Diff line
		@@ -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>

arch/mips/kernel/r4k_switch.S

+0 −1

Original line number	Diff line number	Diff line
		@@ -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>