From owner-svn-src-all@FreeBSD.ORG  Sun Jan 18 13:04:38 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 CAA2A1065672;
	Sun, 18 Jan 2009 13:04:38 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B8B2A8FC13;
	Sun, 18 Jan 2009 13:04:38 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ID4cpi074356;
	Sun, 18 Jan 2009 13:04:38 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0ID4cYV074355;
	Sun, 18 Jan 2009 13:04:38 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200901181304.n0ID4cYV074355@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 18 Jan 2009 13:04:38 +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: r187394 - head/sys/sun4v/include
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jan 2009 13:04:39 -0000

Author: marius
Date: Sun Jan 18 13:04:38 2009
New Revision: 187394
URL: http://svn.freebsd.org/changeset/base/187394

Log:
  Adjust the padding of struct pcpu to r187357.

Modified:
  head/sys/sun4v/include/pcpu.h

Modified: head/sys/sun4v/include/pcpu.h
==============================================================================
--- head/sys/sun4v/include/pcpu.h	Sun Jan 18 12:59:37 2009	(r187393)
+++ head/sys/sun4v/include/pcpu.h	Sun Jan 18 13:04:38 2009	(r187394)
@@ -38,6 +38,12 @@
 
 struct pmap;
 
+#ifdef KTR
+#define	PCPU_MD_FIELDS_PAD	(4 - (PCPU_NAME_LEN + 7) / 8)
+#else
+#define	PCPU_MD_FIELDS_PAD	4
+#endif
+
 /*
  * Inside the kernel, the globally reserved register g7 is used to
  * point at the globaldata structure.
@@ -72,7 +78,7 @@ struct pmap;
 	u_int   pc_kwbuf_full;                                          \
 	struct rwindow pc_tsbwbuf[2];                                   \
         uint16_t pc_cpulist[MAXCPU];                                    \
-	uint64_t pad[4];
+	uint64_t pad[PCPU_MD_FIELDS_PAD];
 
 	/* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick
 	 * succession we _really_ want them to be L1 cache line size aligned