diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2011-11-28 11:11:28 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-12-07 17:01:45 -0500 |
commit | 3d18c98367eac23555ea4887c4f570423474eeaf (patch) | |
tree | 4f9e12003a5acf46c1aea74e7835b4e72814bf93 /arch | |
parent | ab75dc02c151c9d2a2fd446334d740b097a3b9db (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/include/asm/pgtable-32.h | 6 | ||||
-rw-r--r-- | arch/mips/include/asm/tlbmisc.h | 10 | ||||
-rw-r--r-- | arch/mips/jazz/irq.c | 1 | ||||
-rw-r--r-- | arch/mips/jazz/setup.c | 1 | ||||
-rw-r--r-- | arch/mips/mm/tlb-r3k.c | 1 | ||||
-rw-r--r-- | arch/mips/mm/tlb-r4k.c | 1 | ||||
-rw-r--r-- | arch/mips/pci/pci-alchemy.c | 1 |
7 files changed, 15 insertions, 6 deletions
diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h index 8a153d2fa62a..469390656c3f 100644 --- a/arch/mips/include/asm/pgtable-32.h +++ b/arch/mips/include/asm/pgtable-32.h | |||
@@ -19,12 +19,6 @@ | |||
19 | #include <asm-generic/pgtable-nopmd.h> | 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 | * - add_temporary_entry() add a temporary TLB entry. We use TLB entries | 22 | * - add_temporary_entry() add a temporary TLB entry. We use TLB entries |
29 | * starting at the top and working down. This is for populating the | 23 | * starting at the top and working down. This is for populating the |
30 | * TLB before trap_init() puts the TLB miss handler in place. It | 24 | * TLB before trap_init() puts the TLB miss handler in place. It |
diff --git a/arch/mips/include/asm/tlbmisc.h b/arch/mips/include/asm/tlbmisc.h new file mode 100644 index 000000000000..3a452282cba0 --- /dev/null +++ b/arch/mips/include/asm/tlbmisc.h | |||
@@ -0,0 +1,10 @@ | |||
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 */ | ||
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index ca9bd2069142..99ab86ffa4c0 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <asm/io.h> | 20 | #include <asm/io.h> |
21 | #include <asm/jazz.h> | 21 | #include <asm/jazz.h> |
22 | #include <asm/pgtable.h> | 22 | #include <asm/pgtable.h> |
23 | #include <asm/tlbmisc.h> | ||
23 | 24 | ||
24 | static DEFINE_RAW_SPINLOCK(r4030_lock); | 25 | static DEFINE_RAW_SPINLOCK(r4030_lock); |
25 | 26 | ||
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index 0d0f054a02f4..820e926dacbc 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <asm/jazzdma.h> | 21 | #include <asm/jazzdma.h> |
22 | #include <asm/reboot.h> | 22 | #include <asm/reboot.h> |
23 | #include <asm/pgtable.h> | 23 | #include <asm/pgtable.h> |
24 | #include <asm/tlbmisc.h> | ||
24 | 25 | ||
25 | extern asmlinkage void jazz_handle_int(void); | 26 | extern asmlinkage void jazz_handle_int(void); |
26 | 27 | ||
diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c index 87bb85d8d537..ed1fa460f84e 100644 --- a/arch/mips/mm/tlb-r3k.c +++ b/arch/mips/mm/tlb-r3k.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <asm/pgtable.h> | 20 | #include <asm/pgtable.h> |
21 | #include <asm/mmu_context.h> | 21 | #include <asm/mmu_context.h> |
22 | #include <asm/system.h> | 22 | #include <asm/system.h> |
23 | #include <asm/tlbmisc.h> | ||
23 | #include <asm/isadep.h> | 24 | #include <asm/isadep.h> |
24 | #include <asm/io.h> | 25 | #include <asm/io.h> |
25 | #include <asm/bootinfo.h> | 26 | #include <asm/bootinfo.h> |
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c index 0d394e0e8837..d163455552b0 100644 --- a/arch/mips/mm/tlb-r4k.c +++ b/arch/mips/mm/tlb-r4k.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <asm/mmu_context.h> | 19 | #include <asm/mmu_context.h> |
20 | #include <asm/pgtable.h> | 20 | #include <asm/pgtable.h> |
21 | #include <asm/system.h> | 21 | #include <asm/system.h> |
22 | #include <asm/tlbmisc.h> | ||
22 | 23 | ||
23 | extern void build_tlb_refill_handler(void); | 24 | extern void build_tlb_refill_handler(void); |
24 | 25 | ||
diff --git a/arch/mips/pci/pci-alchemy.c b/arch/mips/pci/pci-alchemy.c index b5eddf533c0b..ec125bed721c 100644 --- a/arch/mips/pci/pci-alchemy.c +++ b/arch/mips/pci/pci-alchemy.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/vmalloc.h> | 17 | #include <linux/vmalloc.h> |
18 | 18 | ||
19 | #include <asm/mach-au1x00/au1000.h> | 19 | #include <asm/mach-au1x00/au1000.h> |
20 | #include <asm/tlbmisc.h> | ||
20 | 21 | ||
21 | #ifdef CONFIG_DEBUG_PCI | 22 | #ifdef CONFIG_DEBUG_PCI |
22 | #define DBG(x...) printk(KERN_DEBUG x) | 23 | #define DBG(x...) printk(KERN_DEBUG x) |