D32127.id95669.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D32127.id95669.diff
View Options

	diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
	--- a/sys/kern/kern_malloc.c
	+++ b/sys/kern/kern_malloc.c
	@@ -797,7 +797,7 @@
	void *res;
	size_t asize;

	- KASSERT(align != 0 && powerof2(align),
	+ KASSERT(powerof2(align),
	("malloc_domainset_aligned: wrong align %#zx size %#zx",
	align, size));
	KASSERT(align <= PAGE_SIZE,
	@@ -812,6 +812,8 @@
	* align, since malloc zones provide alignment equal to their
	* size.
	*/
	+ if (size == 0)
	+ size = 1;
	asize = size <= align ? align : 1UL << flsl(size - 1);

	res = malloc_domainset(asize, mtp, ds, flags);
	diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c
	--- a/sys/x86/x86/busdma_bounce.c
	+++ b/sys/x86/x86/busdma_bounce.c
	@@ -453,6 +453,7 @@
	/*
	* Allocate the buffer from the malloc(9) allocator if...
	* - It's small enough to fit into a single page.
	+ * - It's alignment requirement is also smaller than the page size.
	* - The low address requirement is fulfilled.
	* - Default cache attributes are requested (WB).
	* else allocate non-contiguous pages if...
	@@ -467,6 +468,7 @@
	* Warn the user if malloc gets it wrong.
	*/
	if (dmat->common.maxsize <= PAGE_SIZE &&
	+ dmat->common.alignment <= PAGE_SIZE &&
	dmat->common.lowaddr >= ptoa((vm_paddr_t)Maxmem) &&
	attr == VM_MEMATTR_DEFAULT) {
	*vaddr = malloc_domainset_aligned(dmat->common.maxsize,