svn commit: r338030 - in head/sys: dev/amd_ecc_inject dev/drm dev/drm2 vm

[Alan Cox]

Author: alc
Date: Sat Aug 18 22:07:48 2018
New Revision: 338030
URL: https://svnweb.freebsd.org/changeset/base/338030

Log:
  Eliminate the unused arena parameter from kmem_alloc_attr().
  
  Reviewed by:	kib, markj
  Differential Revision:	https://reviews.freebsd.org/D16793

Modified:
  head/sys/dev/amd_ecc_inject/ecc_inject.c
  head/sys/dev/drm/drm_scatter.c
  head/sys/dev/drm2/drm_scatter.c
  head/sys/vm/vm_extern.h
  head/sys/vm/vm_init.c
  head/sys/vm/vm_kern.c

Modified: head/sys/dev/amd_ecc_inject/ecc_inject.c
==============================================================================
--- head/sys/dev/amd_ecc_inject/ecc_inject.c	Sat Aug 18 21:21:06 2018	(r338029)
+++ head/sys/dev/amd_ecc_inject/ecc_inject.c	Sat Aug 18 22:07:48 2018	(r338030)
@@ -186,7 +186,7 @@ ecc_ei_inject(int count)
 	KASSERT(bit_mask != 0 && (bit_mask & ~INJ_VECTOR_MASK) == 0,
 	    ("bit mask value is outside of range: 0x%x", bit_mask));
 
-	memory = kmem_alloc_attr(kernel_arena, PAGE_SIZE, M_WAITOK, 0, ~0,
+	memory = kmem_alloc_attr(PAGE_SIZE, M_WAITOK, 0, ~0,
 	    VM_MEMATTR_UNCACHEABLE);
 
 	for (injected = 0; injected < count; injected++) {

Modified: head/sys/dev/drm/drm_scatter.c
==============================================================================
--- head/sys/dev/drm/drm_scatter.c	Sat Aug 18 21:21:06 2018	(r338029)
+++ head/sys/dev/drm/drm_scatter.c	Sat Aug 18 22:07:48 2018	(r338030)
@@ -52,8 +52,8 @@ drm_sg_alloc(struct drm_device *dev, struct drm_scatte
 	entry->busaddr = malloc(entry->pages * sizeof(*entry->busaddr),
 	    DRM_MEM_SGLISTS, M_WAITOK | M_ZERO);
 
-	entry->vaddr = kmem_alloc_attr(kernel_arena, size, M_WAITOK | M_ZERO,
-	    0, BUS_SPACE_MAXADDR_32BIT, VM_MEMATTR_WRITE_COMBINING);
+	entry->vaddr = kmem_alloc_attr(size, M_WAITOK | M_ZERO, 0,
+	    BUS_SPACE_MAXADDR_32BIT, VM_MEMATTR_WRITE_COMBINING);
 	if (entry->vaddr == 0) {
 		drm_sg_cleanup(entry);
 		return (ENOMEM);

Modified: head/sys/dev/drm2/drm_scatter.c
==============================================================================
--- head/sys/dev/drm2/drm_scatter.c	Sat Aug 18 21:21:06 2018	(r338029)
+++ head/sys/dev/drm2/drm_scatter.c	Sat Aug 18 22:07:48 2018	(r338030)
@@ -37,8 +37,8 @@ __FBSDID("$FreeBSD$");
 
 static inline vm_offset_t drm_vmalloc_dma(vm_size_t size)
 {
-	return kmem_alloc_attr(kernel_arena, size, M_NOWAIT | M_ZERO,
-	    0, BUS_SPACE_MAXADDR_32BIT, VM_MEMATTR_WRITE_COMBINING);
+	return kmem_alloc_attr(size, M_NOWAIT | M_ZERO, 0,
+	    BUS_SPACE_MAXADDR_32BIT, VM_MEMATTR_WRITE_COMBINING);
 }
 
 void drm_sg_cleanup(struct drm_sg_mem * entry)

Modified: head/sys/vm/vm_extern.h
==============================================================================
--- head/sys/vm/vm_extern.h	Sat Aug 18 21:21:06 2018	(r338029)
+++ head/sys/vm/vm_extern.h	Sat Aug 18 22:07:48 2018	(r338030)
@@ -54,7 +54,7 @@ vm_offset_t kmap_alloc_wait(vm_map_t, vm_size_t);
 void kmap_free_wakeup(vm_map_t, vm_offset_t, vm_size_t);
 
 /* These operate on virtual addresses backed by memory. */
-vm_offset_t kmem_alloc_attr(struct vmem *, vm_size_t size, int flags,
+vm_offset_t kmem_alloc_attr(vm_size_t size, int flags,
     vm_paddr_t low, vm_paddr_t high, vm_memattr_t memattr);
 vm_offset_t kmem_alloc_attr_domain(int domain, vm_size_t size, int flags,
     vm_paddr_t low, vm_paddr_t high, vm_memattr_t memattr);

Modified: head/sys/vm/vm_init.c
==============================================================================
--- head/sys/vm/vm_init.c	Sat Aug 18 21:21:06 2018	(r338029)
+++ head/sys/vm/vm_init.c	Sat Aug 18 22:07:48 2018	(r338030)
@@ -274,9 +274,8 @@ again:
 		 * Try to protect 32-bit DMAable memory from the largest
 		 * early alloc of wired mem.
 		 */
-		firstaddr = kmem_alloc_attr(kernel_arena, size,
-		    M_ZERO | M_NOWAIT, (vm_paddr_t)1 << 32,
-		    ~(vm_paddr_t)0, VM_MEMATTR_DEFAULT);
+		firstaddr = kmem_alloc_attr(size, M_ZERO | M_NOWAIT,
+		    (vm_paddr_t)1 << 32, ~(vm_paddr_t)0, VM_MEMATTR_DEFAULT);
 		if (firstaddr == 0)
 #endif
 			firstaddr = kmem_malloc(kernel_arena, size,

Modified: head/sys/vm/vm_kern.c
==============================================================================
--- head/sys/vm/vm_kern.c	Sat Aug 18 21:21:06 2018	(r338029)
+++ head/sys/vm/vm_kern.c	Sat Aug 18 22:07:48 2018	(r338030)
@@ -220,15 +220,12 @@ retry:
 }
 
 vm_offset_t
-kmem_alloc_attr(vmem_t *vmem, vm_size_t size, int flags, vm_paddr_t low,
-    vm_paddr_t high, vm_memattr_t memattr)
+kmem_alloc_attr(vm_size_t size, int flags, vm_paddr_t low, vm_paddr_t high,
+    vm_memattr_t memattr)
 {
 	struct vm_domainset_iter di;
 	vm_offset_t addr;
 	int domain;
-
-	KASSERT(vmem == kernel_arena,
-	    ("kmem_alloc_attr: Only kernel_arena is supported."));
 
 	vm_domainset_iter_malloc_init(&di, kernel_object, &domain, &flags);
 	do {