Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Wed, 3 Mar 2010
 00:27:42 -0700
Received: from mail1.lsil.com (mail1.lsil.com [147.145.40.21])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id o237RgwG012052	for
 <andy.sharp@lsi.com>; Tue, 2 Mar 2010 23:27:42 -0800
Received: from psmtp.com (na3sys009amx231.postini.com [74.125.149.115])	by
 mail1.lsil.com (8.12.11/8.12.11) with SMTP id o237Rej1013319	for
 <andy.sharp@lsi.com>; Tue, 2 Mar 2010 23:27:40 -0800 (PST)
Received: from source ([78.24.191.182]) by na3sys009amx231.postini.com
 ([74.125.148.14]) with SMTP;	Wed, 03 Mar 2010 02:27:41 EST
Received: from localhost.localdomain ([127.0.0.1]:39355 "EHLO
        eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL)        by
 eddie.linux-mips.org with ESMTP id S1491110Ab0CCH1j (ORCPT
        <rfc822;andy.sharp@lsi.com>); Wed, 3 Mar 2010 08:27:39 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 03 Mar 2010 08:27:21
 +0100 (CET)
Received: from mail.windriver.com ([147.11.1.11]:33746 "EHLO
        mail.windriver.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org
        with ESMTP id S1491194Ab0CCH0b (ORCPT
        <rfc822;linux-mips@linux-mips.org>); Wed, 3 Mar 2010 08:26:31 +0100
Received: from localhost.localdomain (pek-lpgbuild1.wrs.com [128.224.153.29])
        by mail.windriver.com (8.14.3/8.14.3) with ESMTP id o237QD6x002456;
        Tue, 2 Mar 2010 23:26:23 -0800 (PST)
From: Yang Shi <yang.shi@windriver.com>
To: "ddaney@caviumnetworks.com" <ddaney@caviumnetworks.com>,
	"ralf@linux-mips.org" <ralf@linux-mips.org>
CC: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Wed, 3 Mar 2010 00:26:12 -0700
Subject: [PATCH 3/3] MIPS: Octeon: Add add_wired_entry decralation in header
 file
Thread-Topic: [PATCH 3/3] MIPS: Octeon: Add add_wired_entry decralation in
 header file
Thread-Index: Acq6owMVHt/VKStnToGtHimAmDAbCQ==
Message-ID:
 <9e4e80f8edd43f8a164fe618c978c1dc8cd48a69.1267600234.git.yang.shi@windriver.com>
References:
 <6310b9cb3048ec0c2873d932778165370e5e7c7e.1267600234.git.yang.shi@windriver.com>
In-Reply-To:
 <6310b9cb3048ec0c2873d932778165370e5e7c7e.1267600234.git.yang.shi@windriver.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <yang.shi@windriver.com> [22/1] 
x-pstn-neptune: 0/0/0.00/0
x-list: linux-mips
x-original-sender: yang.shi@windriver.com
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Octeon's setup.c uses add_wired_entry, but it is not declared
anywhere. Copy add_wired_entry decralation fomr pgtable-32.h to
pgtable-64.h and include asm/pgtable.h into Octeon's setup.c.

Signed-off-by: Yang Shi <yang.shi@windriver.com>
---
 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/setu=
p.c
index 8309d68..f35ba16 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/pagtable.h>
=20
 #include <asm/octeon/octeon.h>
=20
diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgt=
able-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
=20
 /*
+ * - 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
  * (=3D=3D PTRS_PER_PGD) 8 byte pointers to pmd tables. Each pmd table is =
a
  * single 4K page, giving 512 (=3D=3D PTRS_PER_PMD) 8 byte pointers to pag=
e
--=20
1.6.3.3


