From owner-svn-src-head@FreeBSD.ORG  Tue Jul 23 02:38:24 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 2C4B0805;
 Tue, 23 Jul 2013 02:38:24 +0000 (UTC)
 (envelope-from marcel@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 1DFC0204F;
 Tue, 23 Jul 2013 02:38: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 r6N2cNrK021051;
 Tue, 23 Jul 2013 02:38:23 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6N2cNtg021050;
 Tue, 23 Jul 2013 02:38:23 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201307230238.r6N2cNtg021050@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 23 Jul 2013 02:38:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253559 - head/sys/ia64/ia64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Jul 2013 02:38:24 -0000

Author: marcel
Date: Tue Jul 23 02:38:23 2013
New Revision: 253559
URL: http://svnweb.freebsd.org/changeset/base/253559

Log:
  In ia64_mca_init(), don't limit the allocation of the info block to
  fall within the first 256MB of memory. The origin/reason for that
  limitation is not known, but it's not believed to be required for
  proper initialization. What is known is that the Altix 350 does not
  have physical memory at that address (by virtue of the address space
  bits).
  
  Keep the boundary at 256MB so that the info block will be covered
  by a single direct-mapped translation.
  
  While here, change the flags to M_NOWAIT to eliminate confusion. It
  does not change the behaviour of contigmalloc(). What is does is
  makes the flags argument explicitly say what the actual behaviour
  is.

Modified:
  head/sys/ia64/ia64/mca.c

Modified: head/sys/ia64/ia64/mca.c
==============================================================================
--- head/sys/ia64/ia64/mca.c	Tue Jul 23 02:11:22 2013	(r253558)
+++ head/sys/ia64/ia64/mca.c	Tue Jul 23 02:38:23 2013	(r253559)
@@ -284,8 +284,8 @@ ia64_mca_init(void)
 	}
 	max_size = round_page(max_size);
 
-	p = (max_size) ? contigmalloc(max_size, M_TEMP, 0, 0ul,
-	    256*1024*1024 - 1, PAGE_SIZE, 256*1024*1024) : NULL;
+	p = (max_size) ? contigmalloc(max_size, M_TEMP, M_NOWAIT, 0ul, ~0ul,
+	    PAGE_SIZE, 256*1024*1024) : NULL;
 	if (p != NULL) {
 		mca_info_block = IA64_PHYS_TO_RR7(ia64_tpa((u_int64_t)p));