Received: from mail.onstor.com (66.201.51.107) by exch1.onstor.net
 (10.0.0.225) with Microsoft SMTP Server id 8.1.311.2; Tue, 12 May 2009
 12:44:54 -0700
Received: from psmtp.com ([64.18.0.106]) by mail.onstor.com with Microsoft
 SMTPSVC(6.0.3790.3959);	 Tue, 12 May 2009 12:44:54 -0700
Received: from source ([213.58.128.207]) by exprod5mx282.postini.com
 ([64.18.4.11]) with SMTP;	Tue, 12 May 2009 13:44:53 MDT
Received: from localhost.localdomain ([127.0.0.1]:44974 "EHLO
	ftp.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S20025846AbZELTov (ORCPT	<rfc822;andy.sharp@onstor.com>); Tue, 12
 May 2009 20:44:51 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 12 May 2009 20:44:35
 +0100 (BST)
Received: from mail3.caviumnetworks.com ([12.108.191.235]:10297 "EHLO
	mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK)	by ftp.linux-mips.org with
 ESMTP id S20025982AbZELTnY (ORCPT	<rfc822;linux-mips@linux-mips.org>); Tue,
 12 May 2009 20:43:24 +0100
Received: from exch4.caveonetworks.com (Not Verified[192.168.16.23]) by
 mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503)	id <B4a09d1400004>;
 Tue, 12 May 2009 15:42:56 -0400
Received: from exch4.caveonetworks.com ([192.168.16.23]) by
 exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959);	 Tue, 12 May
 2009 12:42:00 -0700
Received: from dd1.caveonetworks.com ([64.169.86.201]) by
 exch4.caveonetworks.com over TLS secured channel with Microsoft
 SMTPSVC(6.0.3790.3959);	 Tue, 12 May 2009 12:42:00 -0700
Received: from dd1.caveonetworks.com (localhost.localdomain [127.0.0.1])	by
 dd1.caveonetworks.com (8.14.2/8.14.2) with ESMTP id n4CJfujr020753;	Tue, 12
 May 2009 12:41:56 -0700
Received: (from ddaney@localhost)	by dd1.caveonetworks.com
 (8.14.2/8.14.2/Submit) id n4CJfuc0020752;	Tue, 12 May 2009 12:41:56 -0700
From: David Daney <ddaney@caviumnetworks.com>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>,
	"ralf@linux-mips.org" <ralf@linux-mips.org>
CC: David Daney <ddaney@caviumnetworks.com>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Tue, 12 May 2009 12:41:55 -0700
Subject: [PATCH 3/3] MIPS: Remove dead case label.
Thread-Topic: [PATCH 3/3] MIPS: Remove dead case label.
Thread-Index: AcnTOh+DuFdHym+8Qy2Q7ytAhmX9iw==
Message-ID: <1242157315-20719-3-git-send-email-ddaney@caviumnetworks.com>
References: <4A09D0B1.2030305@caviumnetworks.com>
In-Reply-To: <4A09D0B1.2030305@caviumnetworks.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Internal
X-MS-Exchange-Organization-AuthMechanism: 0b
X-MS-Exchange-Organization-AuthSource: exch1.onstor.net
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-originalarrivaltime: 12 May 2009 19:42:00.0098 (UTC)
 FILETIME=[B770A820:01C9D339]
x-ems-stamp: ckLvust9aAcICjVUC9DvMg==
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:74.06514/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-list: linux-mips
x-archive-position: 22691
x-ecartis-version: Ecartis v1.0.0
x-original-sender: ddaney@caviumnetworks.com
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

CPU_CAVIUM_OCTEON is mips_r2 which is handled before the switch.  This
label in the switch statement is dead code, so we remove it.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 arch/mips/mm/tlbex.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 4108674..4dc4f3e 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -311,7 +311,6 @@ static void __cpuinit build_tlb_write_entry(u32 **p, st=
ruct uasm_label **l,
 	case CPU_BCM3302:
 	case CPU_BCM4710:
 	case CPU_LOONGSON2:
-	case CPU_CAVIUM_OCTEON:
 	case CPU_R5500:
 		if (m4kc_tlbp_war())
 			uasm_i_nop(p);
--=20
1.6.0.6


