From owner-svn-src-all@FreeBSD.ORG  Thu Nov  8 08:10:32 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9F646DE9;
 Thu,  8 Nov 2012 08:10:32 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 841618FC08;
 Thu,  8 Nov 2012 08:10:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA88AWS3027375;
 Thu, 8 Nov 2012 08:10:32 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA88AW8Y027373;
 Thu, 8 Nov 2012 08:10:32 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201211080810.qA88AW8Y027373@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Thu, 8 Nov 2012 08:10:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242747 - head/sys/kern
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, 08 Nov 2012 08:10:32 -0000

Author: marius
Date: Thu Nov  8 08:10:32 2012
New Revision: 242747
URL: http://svnweb.freebsd.org/changeset/base/242747

Log:
  Make r242655 build on sparc64. While at it, make vm_{max,min}_kernel_address
  vm_offset_t as they should be.

Modified:
  head/sys/kern/kern_malloc.c

Modified: head/sys/kern/kern_malloc.c
==============================================================================
--- head/sys/kern/kern_malloc.c	Thu Nov  8 04:02:36 2012	(r242746)
+++ head/sys/kern/kern_malloc.c	Thu Nov  8 08:10:32 2012	(r242747)
@@ -186,11 +186,13 @@ struct {
  */
 static uma_zone_t mt_zone;
 
-static u_long vm_min_kernel_address = VM_MIN_KERNEL_ADDRESS;
+static vm_offset_t vm_min_kernel_address = VM_MIN_KERNEL_ADDRESS;
 SYSCTL_ULONG(_vm, OID_AUTO, min_kernel_address, CTLFLAG_RD,
     &vm_min_kernel_address, 0, "Min kernel address");
 
-static u_long vm_max_kernel_address = VM_MAX_KERNEL_ADDRESS;
+#ifndef __sparc64__
+static vm_offset_t vm_max_kernel_address = VM_MAX_KERNEL_ADDRESS;
+#endif
 SYSCTL_ULONG(_vm, OID_AUTO, max_kernel_address, CTLFLAG_RD,
     &vm_max_kernel_address, 0, "Max kernel address");