D20505.1785196928.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D20505.1785196928.diff
View Options

	Index: head/sys/arm64/arm64/busdma_bounce.c
	===================================================================
	--- head/sys/arm64/arm64/busdma_bounce.c
	+++ head/sys/arm64/arm64/busdma_bounce.c
	@@ -660,7 +660,7 @@
	/*
	* Add a single contiguous physical range to the segment list.
	*/
	-static int
	+static bus_size_t
	_bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr,
	bus_size_t sgsize, bus_dma_segment_t segs, int segp)
	{
	Index: head/sys/x86/iommu/busdma_dmar.c
	===================================================================
	--- head/sys/x86/iommu/busdma_dmar.c
	+++ head/sys/x86/iommu/busdma_dmar.c
	@@ -686,7 +686,7 @@
	return (ENOMEM);
	fma = NULL;
	for (i = 0; i < ma_cnt; i++) {
	- paddr = pstart + i * PAGE_SIZE;
	+ paddr = pstart + ptoa(i);
	ma[i] = PHYS_TO_VM_PAGE(paddr);
	if (ma[i] == NULL \|\| VM_PAGE_TO_PHYS(ma[i]) != paddr) {
	/*
	Index: head/sys/x86/x86/busdma_bounce.c
	===================================================================
	--- head/sys/x86/x86/busdma_bounce.c
	+++ head/sys/x86/x86/busdma_bounce.c
	@@ -667,7 +667,7 @@
	/*
	* Add a single contiguous physical range to the segment list.
	*/
	-static int
	+static bus_size_t
	_bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t curaddr,
	bus_size_t sgsize, bus_dma_segment_t segs, int segp)
	{