Author: jhb
Date: Wed Dec  2 15:24:57 2009
New Revision: 200030
URL: http://svn.freebsd.org/changeset/base/200030

Log:
  MFC 194429:
  Add support for UMA_SLAB_KERNEL to page_free().  (While I'm here remove an
  unnecessary newline character from the end of two panic messages.)

Modified:
  stable/7/sys/vm/uma_core.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/vm/uma_core.c
==============================================================================
--- stable/7/sys/vm/uma_core.c  Wed Dec  2 15:20:31 2009        (r200029)
+++ stable/7/sys/vm/uma_core.c  Wed Dec  2 15:24:57 2009        (r200030)
@@ -1033,8 +1033,10 @@ page_free(void *mem, int size, u_int8_t 
 
        if (flags & UMA_SLAB_KMEM)
                map = kmem_map;
+       else if (flags & UMA_SLAB_KERNEL)
+               map = kernel_map;
        else
-               panic("UMA: page_free used with invalid flags %d\n", flags);
+               panic("UMA: page_free used with invalid flags %d", flags);
 
        kmem_free(map, (vm_offset_t)mem, size);
 }
@@ -1292,7 +1294,7 @@ keg_ctor(void *mem, int size, void *udat
                        printf("zone %s ipers %d rsize %d size %d\n",
                            zone->uz_name, keg->uk_ipers, keg->uk_rsize,
                            keg->uk_size);
-                       panic("UMA slab won't fit.\n");
+                       panic("UMA slab won't fit.");
                }
        }
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to