Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d18c983 authored Nov 28, 2011 by Ralf Baechle

MIPS: Fix Jazz 64-bit build error.



Move add_wired_entry to its own header file from where it will be
always included.  Patch up other users of add_wired_entry to also include
the header as needed.

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

parent ab75dc02

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

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -18,12 +18,6 @@

	#include <asm-generic/pgtable-nopmd.h>		#include <asm-generic/pgtable-nopmd.h>

	/*
	* - add_wired_entry() add a fixed TLB entry, and move wired register
	*/
	extern void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
	unsigned long entryhi, unsigned long pagemask);

	/*		/*
	* - add_temporary_entry() add a temporary TLB entry. We use TLB entries		* - add_temporary_entry() add a temporary TLB entry. We use TLB entries
	* starting at the top and working down. This is for populating the		* starting at the top and working down. This is for populating the

arch/mips/include/asm/tlbmisc.h

0 → 100644

+10 −0

Original line number	Original line	Diff line number	Diff line
			#ifndef __ASM_TLBMISC_H
			#define __ASM_TLBMISC_H

			/*
			* - add_wired_entry() add a fixed TLB entry, and move wired register
			*/
			extern void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
			unsigned long entryhi, unsigned long pagemask);

			#endif /* __ASM_TLBMISC_H */

arch/mips/jazz/irq.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@
	#include <asm/io.h>		#include <asm/io.h>
	#include <asm/jazz.h>		#include <asm/jazz.h>
	#include <asm/pgtable.h>		#include <asm/pgtable.h>
			#include <asm/tlbmisc.h>

	static DEFINE_RAW_SPINLOCK(r4030_lock);		static DEFINE_RAW_SPINLOCK(r4030_lock);

arch/mips/jazz/setup.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@
	#include <asm/jazzdma.h>		#include <asm/jazzdma.h>
	#include <asm/reboot.h>		#include <asm/reboot.h>
	#include <asm/pgtable.h>		#include <asm/pgtable.h>
			#include <asm/tlbmisc.h>

	extern asmlinkage void jazz_handle_int(void);		extern asmlinkage void jazz_handle_int(void);

arch/mips/mm/tlb-r3k.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@
	#include <asm/pgtable.h>		#include <asm/pgtable.h>
	#include <asm/mmu_context.h>		#include <asm/mmu_context.h>
	#include <asm/system.h>		#include <asm/system.h>
			#include <asm/tlbmisc.h>
	#include <asm/isadep.h>		#include <asm/isadep.h>
	#include <asm/io.h>		#include <asm/io.h>
	#include <asm/bootinfo.h>		#include <asm/bootinfo.h>