svn commit: r224612 - in head/sys: arm/arm arm/sa11x0 mips/mips

[Attilio Rao]

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