From owner-svn-src-stable-9@FreeBSD.ORG Sun Jan 1 16:04:03 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 308E3106566C; Sun, 1 Jan 2012 16:04:03 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F3EC38FC0A; Sun, 1 Jan 2012 16:04:02 +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 q01G42KK019676; Sun, 1 Jan 2012 16:04:02 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q01G42TW019674; Sun, 1 Jan 2012 16:04:02 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201201011604.q01G42TW019674@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 1 Jan 2012 16:04:02 +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: r229170 - stable/9/sys/powerpc/include 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jan 2012 16:04:03 -0000 Author: nwhitehorn Date: Sun Jan 1 16:04:02 2012 New Revision: 229170 URL: http://svn.freebsd.org/changeset/base/229170 Log: Increase the available virtual address space for user programs on PowerPC AIM systems to 4 GB on 32-bit systems and 2^64 bytes on 64-bit systems. VM_MAXUSER_ADDRESS remains at 2 GB on Book-E, due to a different memory layout used on this platform. Modified: stable/9/sys/powerpc/include/vmparam.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/powerpc/include/vmparam.h ============================================================================== --- stable/9/sys/powerpc/include/vmparam.h Sun Jan 1 15:56:15 2012 (r229169) +++ stable/9/sys/powerpc/include/vmparam.h Sun Jan 1 16:04:02 2012 (r229170) @@ -57,29 +57,34 @@ #define MAXSSIZ (64*1024*1024) /* max stack size */ #endif +#ifdef AIM +#define VM_MAXUSER_ADDRESS32 ((vm_offset_t)0xfffff000) +#else +#define VM_MAXUSER_ADDRESS32 ((vm_offset_t)0x7ffff000) +#endif + /* * Would like to have MAX addresses = 0, but this doesn't (currently) work */ #if !defined(LOCORE) #ifdef __powerpc64__ #define VM_MIN_ADDRESS (0x0000000000000000UL) -#define VM_MAXUSER_ADDRESS (0x7ffffffffffff000UL) -#define SHAREDPAGE (VM_MAXUSER_ADDRESS - PAGE_SIZE) +#define VM_MAXUSER_ADDRESS (0xfffffffffffff000UL) #define VM_MAX_ADDRESS (0xffffffffffffffffUL) #else #define VM_MIN_ADDRESS ((vm_offset_t)0) -#define VM_MAXUSER_ADDRESS ((vm_offset_t)0x7ffff000) -#define SHAREDPAGE (VM_MAXUSER_ADDRESS - PAGE_SIZE) -#define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS +#define VM_MAXUSER_ADDRESS VM_MAXUSER_ADDRESS32 +#define VM_MAX_ADDRESS ((vm_offset_t)0xffffffff) #endif +#define SHAREDPAGE (VM_MAXUSER_ADDRESS - PAGE_SIZE) #else /* LOCORE */ -#ifndef __powerpc64__ +#if !defined(__powerpc64__) && defined(E500) #define VM_MIN_ADDRESS 0 #define VM_MAXUSER_ADDRESS 0x7ffff000 #endif #endif /* LOCORE */ -#define FREEBSD32_SHAREDPAGE (0x7ffff000 - PAGE_SIZE) +#define FREEBSD32_SHAREDPAGE (VM_MAXUSER_ADDRESS32 - PAGE_SIZE) #define FREEBSD32_USRSTACK FREEBSD32_SHAREDPAGE #ifdef AIM