From owner-svn-src-all@FreeBSD.ORG  Thu Sep  5 23:00:25 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F3ED4AB4;
 Thu,  5 Sep 2013 23:00:24 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E1C7C2665;
 Thu,  5 Sep 2013 23:00:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r85N0OaN076498;
 Thu, 5 Sep 2013 23:00:24 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r85N0OLX076496;
 Thu, 5 Sep 2013 23:00:24 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201309052300.r85N0OLX076496@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 5 Sep 2013 23:00:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255273 - in head/sys/powerpc: aim include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Thu, 05 Sep 2013 23:00:25 -0000

Author: nwhitehorn
Date: Thu Sep  5 23:00:24 2013
New Revision: 255273
URL: http://svnweb.freebsd.org/changeset/base/255273

Log:
  Align stacks of kernel threads correctly at 16-byte boundaries rather than
  making sure they are all misaligned at +8 bytes. This fixes clang builds
  of powerpc64 kernels (aside from a required increase in KSTACK_PAGES which
  will come later).
  
  This commit from FreeBSD/powerpc64 with a clang-built kernel.
  
  MFC after:	2 weeks

Modified:
  head/sys/powerpc/aim/vm_machdep.c
  head/sys/powerpc/include/frame.h

Modified: head/sys/powerpc/aim/vm_machdep.c
==============================================================================
--- head/sys/powerpc/aim/vm_machdep.c	Thu Sep  5 22:59:18 2013	(r255272)
+++ head/sys/powerpc/aim/vm_machdep.c	Thu Sep  5 23:00:24 2013	(r255273)
@@ -187,6 +187,7 @@ cpu_fork(struct thread *td1, struct proc
 	cf->cf_arg1 = (register_t)tf;
 
 	pcb->pcb_sp = (register_t)cf;
+	KASSERT(pcb->pcb_sp % 16 == 0, ("stack misaligned"));
 	#ifdef __powerpc64__
 	pcb->pcb_lr = ((register_t *)fork_trampoline)[0];
 	pcb->pcb_toc = ((register_t *)fork_trampoline)[1];

Modified: head/sys/powerpc/include/frame.h
==============================================================================
--- head/sys/powerpc/include/frame.h	Thu Sep  5 22:59:18 2013	(r255272)
+++ head/sys/powerpc/include/frame.h	Thu Sep  5 23:00:24 2013	(r255273)
@@ -94,6 +94,7 @@ struct callframe {
 	register_t	cf_func;
 	register_t	cf_arg0;
 	register_t	cf_arg1;
+	register_t	_padding;	/* Maintain 16-byte alignment */
 };
 #else
 struct callframe {