From owner-svn-src-all@FreeBSD.ORG Tue Aug 2 17:49:28 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 46A811065670; Tue, 2 Aug 2011 17:49:28 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1CA578FC15; Tue, 2 Aug 2011 17:49:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p72HnSlc062319; Tue, 2 Aug 2011 17:49:28 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p72HnRMf062315; Tue, 2 Aug 2011 17:49:27 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201108021749.p72HnRMf062315@svn.freebsd.org> From: Attilio Rao Date: Tue, 2 Aug 2011 17:49:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224612 - in head/sys: arm/arm arm/sa11x0 mips/mips X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2011 17:49:28 -0000 Author: attilio Date: Tue Aug 2 17:49:27 2011 New Revision: 224612 URL: http://svn.freebsd.org/changeset/base/224612 Log: Fix for arm and mips case the size of storage for sintrcnt/sintrnames. It seems that "info as" is not much precise on what expect by pseudo-op .word, by the way. No MFC is previewed for this patch. Tested by: andreast, pluknet Approved by: re (kib) Modified: head/sys/arm/arm/irq_dispatch.S head/sys/arm/sa11x0/sa11x0_irq.S head/sys/mips/mips/exception.S Modified: head/sys/arm/arm/irq_dispatch.S ============================================================================== --- head/sys/arm/arm/irq_dispatch.S Tue Aug 2 15:35:43 2011 (r224611) +++ head/sys/arm/arm/irq_dispatch.S Tue Aug 2 17:49:27 2011 (r224612) @@ -109,9 +109,9 @@ _C_LABEL(intrnames): _C_LABEL(intrcnt): .space NIRQ * 4 _C_LABEL(sintrnames): - .word NIRQ * (MAXCOMLEN + 1) + .int NIRQ * (MAXCOMLEN + 1) _C_LABEL(sintrcnt): - .word NIRQ * 4 + .int NIRQ * 4 .global _C_LABEL(current_intr_depth) _C_LABEL(current_intr_depth): Modified: head/sys/arm/sa11x0/sa11x0_irq.S ============================================================================== --- head/sys/arm/sa11x0/sa11x0_irq.S Tue Aug 2 15:35:43 2011 (r224611) +++ head/sys/arm/sa11x0/sa11x0_irq.S Tue Aug 2 17:49:27 2011 (r224612) @@ -122,7 +122,7 @@ ENTRY(sa11x0_activateirqs) .global _C_LABEL(intrnames), _C_LABEL(sintrnames) _C_LABEL(intrnames): _C_LABEL(sintrnames): - .word 0 + .int 0 .globl _C_LABEL(intrcnt), _C_LABEL(sintrcnt) Modified: head/sys/mips/mips/exception.S ============================================================================== --- head/sys/mips/mips/exception.S Tue Aug 2 15:35:43 2011 (r224611) +++ head/sys/mips/mips/exception.S Tue Aug 2 17:49:27 2011 (r224612) @@ -1143,7 +1143,7 @@ sintrnames: #ifdef __mips_n64 .quad INTRCNT_COUNT * (MAXCOMLEN + 1) * 2 #else - .word INTRCNT_COUNT * (MAXCOMLEN + 1) * 2 + .int INTRCNT_COUNT * (MAXCOMLEN + 1) * 2 #endif .align 4 @@ -1153,7 +1153,7 @@ sintrcnt: #ifdef __mips_n64 .quad INTRCNT_COUNT * 4 * 2 #else - .word INTRCNT_COUNT * 4 * 2 + .int INTRCNT_COUNT * 4 * 2 #endif