Index: sys/arm/include/vmparam.h
===================================================================
--- sys/arm/include/vmparam.h	(revision 221870)
+++ sys/arm/include/vmparam.h	(working copy)
@@ -147,8 +147,8 @@
 #define MAXSSIZ         (8*1024*1024)
 #define SGROWSIZ        (128*1024)
 
-#ifdef ARM_USE_SMALL_ALLOC
-#define UMA_MD_SMALL_ALLOC
+#ifndef ARM_USE_SMALL_ALLOC
+#define UMA_MD_NO_SMALL_ALLOC
 #endif /* ARM_USE_SMALL_ALLOC */
 
 #define	ZERO_REGION_SIZE	(64 * 1024)	/* 64KB */
Index: sys/powerpc/include/vmparam.h
===================================================================
--- sys/powerpc/include/vmparam.h	(revision 221870)
+++ sys/powerpc/include/vmparam.h	(working copy)
@@ -95,12 +95,6 @@
 #define	VM_MAX_KERNEL_ADDRESS	(VM_MIN_KERNEL_ADDRESS + 3*SEGMENT_LENGTH - 1)
 #endif
 
-/*
- * Use the direct-mapped BAT registers for UMA small allocs. This
- * takes pressure off the small amount of available KVA.
- */
-#define UMA_MD_SMALL_ALLOC
-
 #else /* Book-E */
 
 /*
@@ -114,6 +108,8 @@
 #define	VM_MIN_KERNEL_ADDRESS	KERNBASE
 #define	VM_MAX_KERNEL_ADDRESS	0xf8000000
 
+#define	UMA_MD_NO_SMALL_ALLOC
+
 #endif /* AIM/E500 */
 
 /* XXX max. amount of KVM to be used by buffers. */
Index: sys/sparc64/include/vmparam.h
===================================================================
--- sys/sparc64/include/vmparam.h	(revision 221870)
+++ sys/sparc64/include/vmparam.h	(working copy)
@@ -236,8 +236,6 @@
 #define	VM_INITIAL_PAGEIN	16
 #endif
 
-#define	UMA_MD_SMALL_ALLOC
-
 extern vm_offset_t vm_max_kernel_address;
 
 /*
Index: sys/mips/include/vmparam.h
===================================================================
--- sys/mips/include/vmparam.h	(revision 221870)
+++ sys/mips/include/vmparam.h	(working copy)
@@ -138,8 +138,6 @@
 #define	VM_INITIAL_PAGEIN	16
 #endif
 
-#define	UMA_MD_SMALL_ALLOC
-
 /*
  * max number of non-contig chunks of physical RAM you can have
  */
Index: sys/vm/uma_core.c
===================================================================
--- sys/vm/uma_core.c	(revision 221870)
+++ sys/vm/uma_core.c	(working copy)
@@ -966,7 +966,7 @@
 	/*
 	 * Now that we've booted reset these users to their real allocator.
 	 */
-#ifdef UMA_MD_SMALL_ALLOC
+#ifndef UMA_MD_NO_SMALL_ALLOC
 	keg->uk_allocf = (keg->uk_ppera > 1) ? page_alloc : uma_small_alloc;
 #else
 	keg->uk_allocf = page_alloc;
@@ -1315,7 +1315,7 @@
 	 * startup cache until the vm is ready.
 	 */
 	if (keg->uk_ppera == 1) {
-#ifdef UMA_MD_SMALL_ALLOC
+#ifndef UMA_MD_NO_SMALL_ALLOC
 		keg->uk_allocf = uma_small_alloc;
 		keg->uk_freef = uma_small_free;
 #endif
@@ -1754,10 +1754,6 @@
 
 	bucket_init();
 
-#if defined(UMA_MD_SMALL_ALLOC) && !defined(UMA_MD_SMALL_ALLOC_NEEDS_VM)
-	booted = 1;
-#endif
-
 #ifdef UMA_DEBUG
 	printf("UMA startup complete.\n");
 #endif
Index: sys/i386/include/vmparam.h
===================================================================
--- sys/i386/include/vmparam.h	(revision 221870)
+++ sys/i386/include/vmparam.h	(working copy)
@@ -69,6 +69,11 @@
 #define	VM_PHYSSEG_DENSE
 
 /*
+ * Don't use small alloc by default.
+ */
+#define	UMA_MD_NO_SMALL_ALLOC
+
+/*
  * The number of PHYSSEG entries must be one greater than the number
  * of phys_avail entries because the phys_avail entry that spans the
  * largest physical address that is accessible by ISA DMA is split
Index: sys/amd64/include/vmparam.h
===================================================================
--- sys/amd64/include/vmparam.h	(revision 221870)
+++ sys/amd64/include/vmparam.h	(working copy)
@@ -70,13 +70,6 @@
 #endif
 
 /*
- * We provide a machine specific single page allocator through the use
- * of the direct mapped segment.  This uses 2MB pages for reduced
- * TLB pressure.
- */
-#define	UMA_MD_SMALL_ALLOC
-
-/*
  * The physical address space is densely populated.
  */
 #define	VM_PHYSSEG_DENSE