svn commit: r338032 - in head/sys: arm/arm arm64/arm64 dev/agp mips/mips
Alan Cox
alc at FreeBSD.org
Sat Aug 18 22:35:22 UTC 2018
Author: alc
Date: Sat Aug 18 22:35:19 2018
New Revision: 338032
URL: https://svnweb.freebsd.org/changeset/base/338032
Log:
Oops. r338030 didn't eliminate the unused arena argument from all of
kmem_alloc_attr()'s callers. Correct that mistake.
Modified:
head/sys/arm/arm/busdma_machdep-v4.c
head/sys/arm/arm/busdma_machdep-v6.c
head/sys/arm/arm/pmap-v6.c
head/sys/arm64/arm64/busdma_bounce.c
head/sys/dev/agp/agp_amd.c
head/sys/dev/agp/agp_ati.c
head/sys/mips/mips/busdma_machdep.c
Modified: head/sys/arm/arm/busdma_machdep-v4.c
==============================================================================
--- head/sys/arm/arm/busdma_machdep-v4.c Sat Aug 18 22:21:59 2018 (r338031)
+++ head/sys/arm/arm/busdma_machdep-v4.c Sat Aug 18 22:35:19 2018 (r338032)
@@ -747,8 +747,8 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int
howmany(dmat->maxsize, MIN(dmat->maxsegsz, PAGE_SIZE)) &&
dmat->alignment <= PAGE_SIZE &&
(dmat->boundary % PAGE_SIZE) == 0) {
- *vaddr = (void *)kmem_alloc_attr(kernel_arena, dmat->maxsize,
- mflags, 0, dmat->lowaddr, memattr);
+ *vaddr = (void *)kmem_alloc_attr(dmat->maxsize, mflags, 0,
+ dmat->lowaddr, memattr);
} else {
*vaddr = (void *)kmem_alloc_contig(kernel_arena, dmat->maxsize,
mflags, 0, dmat->lowaddr, dmat->alignment, dmat->boundary,
Modified: head/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- head/sys/arm/arm/busdma_machdep-v6.c Sat Aug 18 22:21:59 2018 (r338031)
+++ head/sys/arm/arm/busdma_machdep-v6.c Sat Aug 18 22:35:19 2018 (r338032)
@@ -812,8 +812,8 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int
howmany(dmat->maxsize, MIN(dmat->maxsegsz, PAGE_SIZE)) &&
dmat->alignment <= PAGE_SIZE &&
(dmat->boundary % PAGE_SIZE) == 0) {
- *vaddr = (void *)kmem_alloc_attr(kernel_arena, dmat->maxsize,
- mflags, 0, dmat->lowaddr, memattr);
+ *vaddr = (void *)kmem_alloc_attr(dmat->maxsize, mflags, 0,
+ dmat->lowaddr, memattr);
} else {
*vaddr = (void *)kmem_alloc_contig(kernel_arena, dmat->maxsize,
mflags, 0, dmat->lowaddr, dmat->alignment, dmat->boundary,
Modified: head/sys/arm/arm/pmap-v6.c
==============================================================================
--- head/sys/arm/arm/pmap-v6.c Sat Aug 18 22:21:59 2018 (r338031)
+++ head/sys/arm/arm/pmap-v6.c Sat Aug 18 22:35:19 2018 (r338032)
@@ -2236,8 +2236,8 @@ pmap_pinit(pmap_t pmap)
* be used no matter which process is current. Its mapping
* in PT2MAP can be used only for current process.
*/
- pmap->pm_pt2tab = (pt2_entry_t *)kmem_alloc_attr(kernel_arena,
- NB_IN_PT2TAB, M_NOWAIT | M_ZERO, 0, -1UL, pt_memattr);
+ pmap->pm_pt2tab = (pt2_entry_t *)kmem_alloc_attr(NB_IN_PT2TAB,
+ M_NOWAIT | M_ZERO, 0, -1UL, pt_memattr);
if (pmap->pm_pt2tab == NULL) {
/*
* QQQ: As struct pmap is allocated from UMA with
Modified: head/sys/arm64/arm64/busdma_bounce.c
==============================================================================
--- head/sys/arm64/arm64/busdma_bounce.c Sat Aug 18 22:21:59 2018 (r338031)
+++ head/sys/arm64/arm64/busdma_bounce.c Sat Aug 18 22:35:19 2018 (r338032)
@@ -491,9 +491,8 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vad
dmat->common.alignment <= PAGE_SIZE &&
(dmat->common.boundary % PAGE_SIZE) == 0) {
/* Page-based multi-segment allocations allowed */
- *vaddr = (void *)kmem_alloc_attr(kernel_arena,
- dmat->common.maxsize, mflags, 0ul, dmat->common.lowaddr,
- attr);
+ *vaddr = (void *)kmem_alloc_attr(dmat->common.maxsize, mflags,
+ 0ul, dmat->common.lowaddr, attr);
dmat->bounce_flags |= BF_KMEM_ALLOC;
} else {
*vaddr = (void *)kmem_alloc_contig(kernel_arena,
Modified: head/sys/dev/agp/agp_amd.c
==============================================================================
--- head/sys/dev/agp/agp_amd.c Sat Aug 18 22:21:59 2018 (r338031)
+++ head/sys/dev/agp/agp_amd.c Sat Aug 18 22:35:19 2018 (r338032)
@@ -101,9 +101,8 @@ agp_amd_alloc_gatt(device_t dev)
* directory.
*/
gatt->ag_entries = entries;
- gatt->ag_virtual = (void *)kmem_alloc_attr(kernel_arena,
- entries * sizeof(u_int32_t), M_NOWAIT | M_ZERO, 0, ~0,
- VM_MEMATTR_WRITE_COMBINING);
+ gatt->ag_virtual = (void *)kmem_alloc_attr(entries * sizeof(u_int32_t),
+ M_NOWAIT | M_ZERO, 0, ~0, VM_MEMATTR_WRITE_COMBINING);
if (!gatt->ag_virtual) {
if (bootverbose)
device_printf(dev, "allocation failed\n");
@@ -114,8 +113,8 @@ agp_amd_alloc_gatt(device_t dev)
/*
* Allocate the page directory.
*/
- gatt->ag_vdir = (void *)kmem_alloc_attr(kernel_arena, AGP_PAGE_SIZE,
- M_NOWAIT | M_ZERO, 0, ~0, VM_MEMATTR_WRITE_COMBINING);
+ gatt->ag_vdir = (void *)kmem_alloc_attr(AGP_PAGE_SIZE, M_NOWAIT |
+ M_ZERO, 0, ~0, VM_MEMATTR_WRITE_COMBINING);
if (!gatt->ag_vdir) {
if (bootverbose)
device_printf(dev,
Modified: head/sys/dev/agp/agp_ati.c
==============================================================================
--- head/sys/dev/agp/agp_ati.c Sat Aug 18 22:21:59 2018 (r338031)
+++ head/sys/dev/agp/agp_ati.c Sat Aug 18 22:35:19 2018 (r338032)
@@ -133,9 +133,8 @@ agp_ati_alloc_gatt(device_t dev)
/* Alloc the GATT -- pointers to pages of AGP memory */
sc->ag_entries = entries;
- sc->ag_virtual = (void *)kmem_alloc_attr(kernel_arena,
- entries * sizeof(u_int32_t), M_NOWAIT | M_ZERO, 0, ~0,
- VM_MEMATTR_WRITE_COMBINING);
+ sc->ag_virtual = (void *)kmem_alloc_attr(entries * sizeof(u_int32_t),
+ M_NOWAIT | M_ZERO, 0, ~0, VM_MEMATTR_WRITE_COMBINING);
if (sc->ag_virtual == NULL) {
if (bootverbose)
device_printf(dev, "GATT allocation failed\n");
@@ -143,8 +142,8 @@ agp_ati_alloc_gatt(device_t dev)
}
/* Alloc the page directory -- pointers to each page of the GATT */
- sc->ag_vdir = (void *)kmem_alloc_attr(kernel_arena, AGP_PAGE_SIZE,
- M_NOWAIT | M_ZERO, 0, ~0, VM_MEMATTR_WRITE_COMBINING);
+ sc->ag_vdir = (void *)kmem_alloc_attr(AGP_PAGE_SIZE, M_NOWAIT | M_ZERO,
+ 0, ~0, VM_MEMATTR_WRITE_COMBINING);
if (sc->ag_vdir == NULL) {
if (bootverbose)
device_printf(dev, "pagedir allocation failed\n");
Modified: head/sys/mips/mips/busdma_machdep.c
==============================================================================
--- head/sys/mips/mips/busdma_machdep.c Sat Aug 18 22:21:59 2018 (r338031)
+++ head/sys/mips/mips/busdma_machdep.c Sat Aug 18 22:35:19 2018 (r338032)
@@ -714,8 +714,8 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddrp, in
howmany(dmat->maxsize, MIN(dmat->maxsegsz, PAGE_SIZE)) &&
dmat->alignment <= PAGE_SIZE &&
(dmat->boundary % PAGE_SIZE) == 0) {
- vaddr = (void *)kmem_alloc_attr(kernel_arena, dmat->maxsize,
- mflags, 0, dmat->lowaddr, memattr);
+ vaddr = (void *)kmem_alloc_attr(dmat->maxsize, mflags, 0,
+ dmat->lowaddr, memattr);
} else {
vaddr = (void *)kmem_alloc_contig(kernel_arena, dmat->maxsize,
mflags, 0, dmat->lowaddr, dmat->alignment, dmat->boundary,
More information about the svn-src-all
mailing list