Date: Mon, 4 May 2020 07:57:55 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r360620 - in stable/12/sys: sys x86/include Message-ID: <202005040757.0447vt7h084734@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Mon May 4 07:57:55 2020 New Revision: 360620 URL: https://svnweb.freebsd.org/changeset/base/360620 Log: Move id_mapped to end of bus_dma_impl structure to preserve KPI for 12-stable. This is a direct commit. Bump the __FreeBSD_version to force recompilation of external kernel modules. Reported by: kib @ Sponsored by: Mellanox Technologies Modified: stable/12/sys/sys/param.h stable/12/sys/x86/include/busdma_impl.h Modified: stable/12/sys/sys/param.h ============================================================================== --- stable/12/sys/sys/param.h Mon May 4 05:49:11 2020 (r360619) +++ stable/12/sys/sys/param.h Mon May 4 07:57:55 2020 (r360620) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1201515 /* Master, propagated to newvers */ +#define __FreeBSD_version 1201516 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, Modified: stable/12/sys/x86/include/busdma_impl.h ============================================================================== --- stable/12/sys/x86/include/busdma_impl.h Mon May 4 05:49:11 2020 (r360619) +++ stable/12/sys/x86/include/busdma_impl.h Mon May 4 07:57:55 2020 (r360620) @@ -62,7 +62,6 @@ struct bus_dma_impl { void *lockfuncarg, bus_dma_tag_t *dmat); int (*tag_destroy)(bus_dma_tag_t dmat); int (*tag_set_domain)(bus_dma_tag_t); - bool (*id_mapped)(bus_dma_tag_t, vm_paddr_t, bus_size_t); int (*map_create)(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp); int (*map_destroy)(bus_dma_tag_t dmat, bus_dmamap_t map); int (*mem_alloc)(bus_dma_tag_t dmat, void** vaddr, int flags, @@ -85,6 +84,7 @@ struct bus_dma_impl { void (*map_unload)(bus_dma_tag_t dmat, bus_dmamap_t map); void (*map_sync)(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op); + bool (*id_mapped)(bus_dma_tag_t, vm_paddr_t, bus_size_t); }; void bus_dma_dflt_lock(void *arg, bus_dma_lock_op_t op);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005040757.0447vt7h084734>