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; Tue, 30 Mar 2010
 17:18:11 -0600
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 o2UNIAjf006659	for
 <andy.sharp@lsi.com>; Tue, 30 Mar 2010 16:18:11 -0700
Received: from psmtp.com (na3sys009amx188.postini.com [74.125.149.169])	by
 mail1.lsil.com (8.12.11/8.12.11) with SMTP id o2UNI7qj023730	for
 <andy.sharp@lsi.com>; Tue, 30 Mar 2010 16:18:08 -0700 (PDT)
Received: from source ([78.24.191.182]) by na3sys009amx188.postini.com
 ([74.125.148.14]) with SMTP;	Tue, 30 Mar 2010 16:18:08 PDT
Received: from localhost.localdomain ([127.0.0.1]:47464 "EHLO
        eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL)        by
 eddie.linux-mips.org with ESMTP id S1492504Ab0C3XRs (ORCPT
        <rfc822;andy.sharp@lsi.com>); Wed, 31 Mar 2010 01:17:48 +0200
Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 31 Mar 2010 01:17:30
 +0200 (CEST)
Received: from kroah.org ([198.145.64.141]:34778 "EHLO coco.kroah.org"
        rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP        id
 S1492502Ab0C3XR1 (ORCPT <rfc822;linux-mips@linux-mips.org>);        Wed, 31
 Mar 2010 01:17:27 +0200
Received: from localhost (c-67-168-196-28.hsd1.or.comcast.net [67.168.196.28])
        (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))        (No
 client certificate requested)        by coco.kroah.org (Postfix) with ESMTPSA
 id 68E5348DA8;        Tue, 30 Mar 2010 16:17:23 -0700 (PDT)
From: Greg KH <gregkh@suse.de>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"stable@kernel.org" <stable@kernel.org>
CC: "stable-review@kernel.org" <stable-review@kernel.org>,
	"torvalds@linux-foundation.org" <torvalds@linux-foundation.org>,
	"akpm@linux-foundation.org" <akpm@linux-foundation.org>,
	"alan@lxorguk.ukuu.org.uk" <alan@lxorguk.ukuu.org.uk>, David Daney
	<ddaney@caviumnetworks.com>, "linux-mips@linux-mips.org"
	<linux-mips@linux-mips.org>, Ralf Baechle <ralf@linux-mips.org>, Greg
 Kroah-Hartman <gregkh@suse.de>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Tue, 30 Mar 2010 16:54:43 -0600
Subject: [005/116] MIPS: Cleanup forgotten label_module_alloc in tlbex.c
Thread-Topic: [005/116] MIPS: Cleanup forgotten label_module_alloc in tlbex.c
Thread-Index: AcrQX0RhpN67JebZTjG4tZ3ZQWaJDw==
Message-ID: <20100330225558.997618252@linux.site>
In-Reply-To: <20100330230600.GA28802@kroah.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 <gregkh@suse.de> [22/1] 
x-pstn-neptune: 1/1/1.00/85
user-agent: quilt/0.47-14.9
x-mailbox-line: From linux@linux.site Tue Mar 30 15:55:59 2010
x-list: linux-mips
x-original-sender: gregkh@suse.de
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

2.6.32-stable review patch.  If anyone has any objections, please let us kn=
ow.

------------------

From: David Daney <ddaney@caviumnetworks.com>

commit abbdc3d88aa2d5c937b21044c336bcd056c1732f upstream.

commit c8af165342e83a4eb078c9607d29a7c399d30a53 (lmo) rsp.
e0cc87f59490d7d62a8ab2a76498dc8a2b64927a (kernel.org) left
label_module_alloc unused.  Remove it now.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/752/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 arch/mips/mm/tlbex.c |    8 --------
 1 file changed, 8 deletions(-)

--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -73,9 +73,6 @@ static int __cpuinit m4kc_tlbp_war(void)
 enum label_id {
 	label_second_part =3D 1,
 	label_leave,
-#ifdef MODULE_START
-	label_module_alloc,
-#endif
 	label_vmalloc,
 	label_vmalloc_done,
 	label_tlbw_hazard,
@@ -92,9 +89,6 @@ enum label_id {
=20
 UASM_L_LA(_second_part)
 UASM_L_LA(_leave)
-#ifdef MODULE_START
-UASM_L_LA(_module_alloc)
-#endif
 UASM_L_LA(_vmalloc)
 UASM_L_LA(_vmalloc_done)
 UASM_L_LA(_tlbw_hazard)
@@ -802,8 +796,6 @@ static void __cpuinit build_r4000_tlb_re
 	} else {
 #if defined(CONFIG_HUGETLB_PAGE)
 		const enum label_id ls =3D label_tlb_huge_update;
-#elif defined(MODULE_START)
-		const enum label_id ls =3D label_module_alloc;
 #else
 		const enum label_id ls =3D label_vmalloc;
 #endif



