Commit 3d18c98367eac23555ea4887c4f570423474eeaf

Authored by Ralf Baechle
1 parent ab75dc02c1

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>

Showing 7 changed files with 15 additions and 6 deletions Side-by-side Diff

arch/mips/include/asm/pgtable-32.h
... ... @@ -19,12 +19,6 @@
19 19 #include <asm-generic/pgtable-nopmd.h>
20 20  
21 21 /*
22   - * - add_wired_entry() add a fixed TLB entry, and move wired register
23   - */
24   -extern void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
25   - unsigned long entryhi, unsigned long pagemask);
26   -
27   -/*
28 22 * - add_temporary_entry() add a temporary TLB entry. We use TLB entries
29 23 * starting at the top and working down. This is for populating the
30 24 * TLB before trap_init() puts the TLB miss handler in place. It
arch/mips/include/asm/tlbmisc.h
  1 +#ifndef __ASM_TLBMISC_H
  2 +#define __ASM_TLBMISC_H
  3 +
  4 +/*
  5 + * - add_wired_entry() add a fixed TLB entry, and move wired register
  6 + */
  7 +extern void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
  8 + unsigned long entryhi, unsigned long pagemask);
  9 +
  10 +#endif /* __ASM_TLBMISC_H */
arch/mips/jazz/irq.c
... ... @@ -20,6 +20,7 @@
20 20 #include <asm/io.h>
21 21 #include <asm/jazz.h>
22 22 #include <asm/pgtable.h>
  23 +#include <asm/tlbmisc.h>
23 24  
24 25 static DEFINE_RAW_SPINLOCK(r4030_lock);
25 26  
arch/mips/jazz/setup.c
... ... @@ -21,6 +21,7 @@
21 21 #include <asm/jazzdma.h>
22 22 #include <asm/reboot.h>
23 23 #include <asm/pgtable.h>
  24 +#include <asm/tlbmisc.h>
24 25  
25 26 extern asmlinkage void jazz_handle_int(void);
26 27  
arch/mips/mm/tlb-r3k.c
... ... @@ -20,6 +20,7 @@
20 20 #include <asm/pgtable.h>
21 21 #include <asm/mmu_context.h>
22 22 #include <asm/system.h>
  23 +#include <asm/tlbmisc.h>
23 24 #include <asm/isadep.h>
24 25 #include <asm/io.h>
25 26 #include <asm/bootinfo.h>
arch/mips/mm/tlb-r4k.c
... ... @@ -19,6 +19,7 @@
19 19 #include <asm/mmu_context.h>
20 20 #include <asm/pgtable.h>
21 21 #include <asm/system.h>
  22 +#include <asm/tlbmisc.h>
22 23  
23 24 extern void build_tlb_refill_handler(void);
24 25  
arch/mips/pci/pci-alchemy.c
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/vmalloc.h>
18 18  
19 19 #include <asm/mach-au1x00/au1000.h>
  20 +#include <asm/tlbmisc.h>
20 21  
21 22 #ifdef CONFIG_DEBUG_PCI
22 23 #define DBG(x...) printk(KERN_DEBUG x)