D46057.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D46057.diff
View Options

	diff --git a/sys/arm/nvidia/drm2/tegra_bo.c b/sys/arm/nvidia/drm2/tegra_bo.c
	--- a/sys/arm/nvidia/drm2/tegra_bo.c
	+++ b/sys/arm/nvidia/drm2/tegra_bo.c
	@@ -71,7 +71,7 @@

	vm_object_deallocate(bo->cdev_pager);
	if (bo->vbase != 0)
	- vmem_free(kmem_arena, bo->vbase, size);
	+ vmem_free(kernel_arena, bo->vbase, size);
	}

	static void
	@@ -137,7 +137,7 @@
	size = round_page(bo->gem_obj.size);

	bo->pbase = VM_PAGE_TO_PHYS(bo->m[0]);
	- if (vmem_alloc(kmem_arena, size, M_WAITOK \| M_BESTFIT, &bo->vbase))
	+ if (vmem_alloc(kernel_arena, size, M_WAITOK \| M_BESTFIT, &bo->vbase))
	return (ENOMEM);

	VM_OBJECT_WLOCK(bo->cdev_pager);
	diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c
	--- a/sys/kern/subr_vmem.c
	+++ b/sys/kern/subr_vmem.c
	@@ -236,9 +236,7 @@
	static struct vmem kernel_arena_storage;
	static struct vmem buffer_arena_storage;
	static struct vmem transient_arena_storage;
	-/* kernel and kmem arenas are aliased for backwards KPI compat. */
	vmem_t *kernel_arena = &kernel_arena_storage;
	-vmem_t *kmem_arena = &kernel_arena_storage;
	vmem_t *buffer_arena = &buffer_arena_storage;
	vmem_t *transient_arena = &transient_arena_storage;

	diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
	--- a/sys/vm/vm_kern.h
	+++ b/sys/vm/vm_kern.h
	@@ -69,7 +69,6 @@
	extern struct vm_map pipe_map_store;
	#define pipe_map (&pipe_map_store)
	extern struct vmem *kernel_arena;
	-extern struct vmem *kmem_arena;
	extern struct vmem *buffer_arena;
	extern struct vmem *transient_arena;
	extern struct vmem *memguard_arena;