From owner-svn-src-stable-9@FreeBSD.ORG Thu Sep 26 18:18:52 2013 Return-Path: Delivered-To: svn-src-stable-9@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 83855B9F; Thu, 26 Sep 2013 18:18:52 +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 6F5562F8F; Thu, 26 Sep 2013 18:18:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8QIIqgj086222; Thu, 26 Sep 2013 18:18:52 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8QIIqVK086220; Thu, 26 Sep 2013 18:18:52 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201309261818.r8QIIqVK086220@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 26 Sep 2013 18:18:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r255897 - in stable/9/sys/powerpc: aim include X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Sep 2013 18:18:52 -0000 Author: nwhitehorn Date: Thu Sep 26 18:18:51 2013 New Revision: 255897 URL: http://svnweb.freebsd.org/changeset/base/255897 Log: MFC r255273,255282: 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). Modified: stable/9/sys/powerpc/aim/vm_machdep.c stable/9/sys/powerpc/include/frame.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/powerpc/aim/vm_machdep.c ============================================================================== --- stable/9/sys/powerpc/aim/vm_machdep.c Thu Sep 26 18:10:19 2013 (r255896) +++ stable/9/sys/powerpc/aim/vm_machdep.c Thu Sep 26 18:18:51 2013 (r255897) @@ -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: stable/9/sys/powerpc/include/frame.h ============================================================================== --- stable/9/sys/powerpc/include/frame.h Thu Sep 26 18:10:19 2013 (r255896) +++ stable/9/sys/powerpc/include/frame.h Thu Sep 26 18:18:51 2013 (r255897) @@ -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 { @@ -102,6 +103,7 @@ struct callframe { register_t cf_func; register_t cf_arg0; register_t cf_arg1; + register_t _padding; /* Maintain 16-byte alignment */ }; #endif