Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Sep 2010 18:09:16 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r212683 - in stable/7/sys: sparc64/include sparc64/sparc64 sun4v/include sun4v/sun4v
Message-ID:  <201009151809.o8FI9GL7045546@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marius
Date: Wed Sep 15 18:09:15 2010
New Revision: 212683
URL: http://svn.freebsd.org/changeset/base/212683

Log:
  MFC: r210176
  
  Allocate proper amount of memory for interrupt names on sparc64 and
  sun4v, same as done on other architectures. This removes garbage from
  `vmstat -ia` output.

Modified:
  stable/7/sys/sparc64/include/intr_machdep.h
  stable/7/sys/sparc64/sparc64/exception.S
  stable/7/sys/sparc64/sparc64/genassym.c
  stable/7/sys/sun4v/include/intr_machdep.h
  stable/7/sys/sun4v/sun4v/exception.S
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/sparc64/include/intr_machdep.h
==============================================================================
--- stable/7/sys/sparc64/include/intr_machdep.h	Wed Sep 15 17:59:22 2010	(r212682)
+++ stable/7/sys/sparc64/include/intr_machdep.h	Wed Sep 15 18:09:15 2010	(r212683)
@@ -33,7 +33,6 @@
 
 #define	PIL_MAX		(1 << 4)
 #define	IV_MAX		(1 << 11)
-#define	IV_NAMLEN	1024
 
 #define	IR_FREE		(PIL_MAX * 2)
 

Modified: stable/7/sys/sparc64/sparc64/exception.S
==============================================================================
--- stable/7/sys/sparc64/sparc64/exception.S	Wed Sep 15 17:59:22 2010	(r212682)
+++ stable/7/sys/sparc64/sparc64/exception.S	Wed Sep 15 18:09:15 2010	(r212683)
@@ -365,7 +365,7 @@ ENTRY(rsf_fatal)
 	sir
 END(rsf_fatal)
 
-	.comm	intrnames, IV_NAMLEN
+	.comm	intrnames, IV_MAX * (MAXCOMLEN + 1)
 	.comm	eintrnames, 0
 
 	.comm	intrcnt, IV_MAX * 8

Modified: stable/7/sys/sparc64/sparc64/genassym.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/genassym.c	Wed Sep 15 17:59:22 2010	(r212682)
+++ stable/7/sys/sparc64/sparc64/genassym.c	Wed Sep 15 18:09:15 2010	(r212683)
@@ -160,6 +160,7 @@ ASSYM(HASH_ENTRY_SHIFT, HASH_ENTRY_SHIFT
 
 ASSYM(V_INTR, offsetof(struct vmmeter, v_intr));
 
+ASSYM(MAXCOMLEN, MAXCOMLEN);
 ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread));
 ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb));
 ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid));

Modified: stable/7/sys/sun4v/include/intr_machdep.h
==============================================================================
--- stable/7/sys/sun4v/include/intr_machdep.h	Wed Sep 15 17:59:22 2010	(r212682)
+++ stable/7/sys/sun4v/include/intr_machdep.h	Wed Sep 15 18:09:15 2010	(r212683)
@@ -33,7 +33,6 @@
 
 #define	PIL_MAX		(1 << 4)
 #define	IV_MAX		(1 << 11)
-#define IV_NAMLEN	1024
 
 #define	IR_FREE		(PIL_MAX * 2)
 

Modified: stable/7/sys/sun4v/sun4v/exception.S
==============================================================================
--- stable/7/sys/sun4v/sun4v/exception.S	Wed Sep 15 17:59:22 2010	(r212682)
+++ stable/7/sys/sun4v/sun4v/exception.S	Wed Sep 15 18:09:15 2010	(r212683)
@@ -1948,7 +1948,7 @@ END(fork_trampoline)
 
 
 
-	.comm	intrnames, IV_NAMLEN
+	.comm	intrnames, IV_MAX * (MAXCOMLEN + 1)
 	.comm	eintrnames, 0
 
 	.comm	intrcnt, IV_MAX * 8



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009151809.o8FI9GL7045546>