svn commit: r244746 - projects/altix2/sys/ia64/ia64

[Marcel Moolenaar]

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));