Page MenuHomeFreeBSD
Files F166818150

D16793.id46911.diff
No OneTemporary
Actions

D16793.id46911.diff
View Options

Index: head/sys/dev/amd_ecc_inject/ecc_inject.c
===================================================================
--- head/sys/dev/amd_ecc_inject/ecc_inject.c
+++ head/sys/dev/amd_ecc_inject/ecc_inject.c
@@ -186,7 +186,7 @@
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++) {
Index: head/sys/dev/drm/drm_scatter.c
===================================================================
--- head/sys/dev/drm/drm_scatter.c
+++ head/sys/dev/drm/drm_scatter.c
@@ -52,8 +52,8 @@
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);
Index: head/sys/dev/drm2/drm_scatter.c
===================================================================
--- head/sys/dev/drm2/drm_scatter.c
+++ head/sys/dev/drm2/drm_scatter.c
@@ -37,8 +37,8 @@
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)
Index: head/sys/vm/vm_extern.h
===================================================================
--- head/sys/vm/vm_extern.h
+++ head/sys/vm/vm_extern.h
@@ -54,7 +54,7 @@
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);
Index: head/sys/vm/vm_init.c
===================================================================
--- head/sys/vm/vm_init.c
+++ head/sys/vm/vm_init.c
@@ -274,9 +274,8 @@
* 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,
Index: head/sys/vm/vm_kern.c
===================================================================
--- head/sys/vm/vm_kern.c
+++ head/sys/vm/vm_kern.c
@@ -220,15 +220,12 @@
}
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 {

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 17, 8:48 PM (3 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36870306
Default Alt Text
D16793.id46911.diff (3 KB)

Event Timeline