From owner-svn-src-stable-9@FreeBSD.ORG  Fri Jun 15 23:07:51 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EB900106566B;
	Fri, 15 Jun 2012 23:07:51 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D5B368FC08;
	Fri, 15 Jun 2012 23:07:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5FN7pBu008902;
	Fri, 15 Jun 2012 23:07:51 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5FN7piK008900;
	Fri, 15 Jun 2012 23:07:51 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201206152307.q5FN7piK008900@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 15 Jun 2012 23:07:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237150 - stable/9/sys/powerpc/aim
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jun 2012 23:07:52 -0000

Author: kib
Date: Fri Jun 15 23:07:51 2012
New Revision: 237150
URL: http://svn.freebsd.org/changeset/base/237150

Log:
  MFC r230779:
  Fix build for the case of powerpc64 kernel without COMPAT_FREEBSD32.
  
  Pointy hat to:	kib

Modified:
  stable/9/sys/powerpc/aim/mmu_oea64.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- stable/9/sys/powerpc/aim/mmu_oea64.c	Fri Jun 15 22:56:28 2012	(r237149)
+++ stable/9/sys/powerpc/aim/mmu_oea64.c	Fri Jun 15 23:07:51 2012	(r237150)
@@ -114,6 +114,7 @@ __FBSDID("$FreeBSD$");
  * correct.
  */
 
+#include "opt_compat.h"
 #include "opt_kstack_pages.h"
 
 #include <sys/param.h>
@@ -1469,7 +1470,9 @@ moea64_init(mmu_t mmu)
 		uma_zone_set_allocf(moea64_mpvo_zone,moea64_uma_page_alloc);
 	}
 
+#ifdef COMPAT_FREEBSD32
 	elf32_nxstack = 1;
+#endif
 
 	moea64_initialized = TRUE;
 }