On 03/03/2010 12:43 AM, Yang Shi wrote:
Octeon's setup.c uses add_wired_entry, but it is not declared
anywhere. Copy add_wired_entry decralation from pgtable-32.h to
pgtable-64.h and include asm/pgtable.h into Octeon's setup.c.
Signed-off-by: Yang Shi<yang.shi@xxxxxxxxxxxxx>
NAK!
We are removing the use of add_wired_entry(), so adding a declaration
will not be necessary.
David Daney
---
arch/mips/cavium-octeon/setup.c | 1 +
arch/mips/include/asm/pgtable-64.h | 6 ++++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 8309d68..d63b8e6 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -30,6 +30,7 @@
#include<asm/bootinfo.h>
#include<asm/sections.h>
#include<asm/time.h>
+#include<asm/pgtable.h>
#include<asm/octeon/octeon.h>
diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h
index 26dc69d..85ee34d 100644
--- a/arch/mips/include/asm/pgtable-64.h
+++ b/arch/mips/include/asm/pgtable-64.h
@@ -23,6 +23,12 @@
#endif
/*
+ * - 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);
+
+/*
* Each address space has 2 4K pages as its page directory, giving 1024
* (== PTRS_PER_PGD) 8 byte pointers to pmd tables. Each pmd table is a
* single 4K page, giving 512 (== PTRS_PER_PMD) 8 byte pointers to page