From patchwork Tue May 24 01:53:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chubb X-Patchwork-Id: 810552 Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4O1tbjd012255 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 24 May 2011 01:55:58 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by bombadil.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QOgof-00028Q-Kv; Tue, 24 May 2011 01:53:49 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QOgoe-0004Ka-2y; Tue, 24 May 2011 01:53:48 +0000 Received: from lemon.ertos.nicta.com.au ([203.143.174.143] helo=lemon.ken.nicta.com.au) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QOgoa-0004KI-Qo for linux-arm-kernel@lists.infradead.org; Tue, 24 May 2011 01:53:45 +0000 Received: from vampire.ertos.nicta.com.au ([203.143.161.65]:58492 helo=croc.chubb.wattle.id.au) by lemon.ken.nicta.com.au with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1QOgoR-00029f-NK; Tue, 24 May 2011 11:53:36 +1000 Date: Tue, 24 May 2011 11:53:32 +1000 Message-ID: From: Peter Chubb To: linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/23.3 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) X-Face: GgFg(Z>fx((4\32hvXq<)|jndSniCH~~$D)Ka:P@e@JR1P%Vr}EwUdfwf-4j\rUs#JR{'h# !]])6%Jh~b$VA|ALhnpPiHu[-x~@<"@Iv&|%R)Fq[[, (&Z'O)Q)xCqe1\M[F8#9l8~}#u$S$Rm`S9% \'T@`:&8>Sb*c5d'=eDYI&GF`+t[LfDH="MP5rwOO]w>ALi7'=QJHz&y&C&TE_3j! Organization: National ICT Australia MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") X-SA-Exim-Connect-IP: 203.143.161.65 X-SA-Exim-Mail-From: peter.chubb@nicta.com.au X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on lemon.ken.nicta.com.au X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 Subject: Trivial patch to fix compilation for Armulator X-SA-Exim-Version: 4.2.1 (built Wed, 25 Jun 2008 17:20:11 +0000) X-SA-Exim-Scanned: Yes (on lemon.ken.nicta.com.au) X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110523_215345_127335_C3611145 X-CRM114-Status: UNSURE ( 7.57 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 24 May 2011 01:55:58 +0000 (UTC) Hi Russell, In Linux 2.6.39 as updated today there's a typo in arch/arm/mm/proc-arm7tdmi.S that prevents compilation with: /tmp/ccPWiEKN.s: Error: .size expression for __arm7tdmi_proc_info does not evaluate to a constant Signed-off-by: Peter Chubb --- Dr Peter Chubb http://www.gelato.unsw.edu.au peterc AT gelato.unsw.edu.au http://www.ertos.nicta.com.au ERTOS within National ICT Australia Index: linux-2.6/arch/arm/mm/proc-arm7tdmi.S =================================================================== --- linux-2.6.orig/arch/arm/mm/proc-arm7tdmi.S 2011-05-24 11:48:03.828496126 +1000 +++ linux-2.6/arch/arm/mm/proc-arm7tdmi.S 2011-05-24 11:48:19.724240476 +1000 @@ -139,21 +139,21 @@ __arm7tdmi_proc_info: .long 0 b __arm7tdmi_setup .long cpu_arch_name .long cpu_elf_name .long HWCAP_SWP | HWCAP_26BIT .long cpu_arm7tdmi_name .long arm7tdmi_processor_functions .long 0 .long 0 .long v4_cache_fns - .size __arm7tdmi_proc_info, . - __arm7dmi_proc_info + .size __arm7tdmi_proc_info, . - __arm7tdmi_proc_info .type __triscenda7_proc_info, #object __triscenda7_proc_info: .long 0x0001d2ff .long 0x0001ffff .long 0 .long 0 b __arm7tdmi_setup .long cpu_arch_name .long cpu_elf_name