From owner-svn-src-projects@FreeBSD.ORG  Thu Dec 27 20:46:17 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id ACF71CA6;
 Thu, 27 Dec 2012 20:46:17 +0000 (UTC)
 (envelope-from marcel@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 9184D8FC0C;
 Thu, 27 Dec 2012 20:46:17 +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 qBRKkHw6053797;
 Thu, 27 Dec 2012 20:46:17 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRKkHu3053796;
 Thu, 27 Dec 2012 20:46:17 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201212272046.qBRKkHu3053796@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 27 Dec 2012 20:46:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244746 - projects/altix2/sys/ia64/ia64
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 20:46:17 -0000

Author: marcel
Date: Thu Dec 27 20:46:17 2012
New Revision: 244746
URL: http://svnweb.freebsd.org/changeset/base/244746

Log:
  Fix a hang in contigmalloc(). The low & high limits defined a memory
  range that contained no memory. This used to result in a failure but
  changed into a hang. Lift the high limit restriction.

Modified:
  projects/altix2/sys/ia64/ia64/mca.c

Modified: projects/altix2/sys/ia64/ia64/mca.c
==============================================================================
--- projects/altix2/sys/ia64/ia64/mca.c	Thu Dec 27 20:31:12 2012	(r244745)
+++ projects/altix2/sys/ia64/ia64/mca.c	Thu Dec 27 20:46:17 2012	(r244746)
@@ -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));