Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:42:10 UTC 2021
Modified Files:
src/sys/external/bsd/common/include/linux: types.h
src/sys/external/bsd/drm2/include/linux: dma-mapping.h
Log Message:
Move dma_addr_t to linux/types.h.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/common/include/linux/types.h
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/include/linux/dma-mapping.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/common/include/linux/types.h
diff -u src/sys/external/bsd/common/include/linux/types.h:1.2 src/sys/external/bsd/common/include/linux/types.h:1.3
--- src/sys/external/bsd/common/include/linux/types.h:1.2 Sun Dec 19 01:19:37 2021
+++ src/sys/external/bsd/common/include/linux/types.h Sun Dec 19 01:42:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.2 2021/12/19 01:19:37 riastradh Exp $ */
+/* $NetBSD: types.h,v 1.3 2021/12/19 01:42:09 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -82,6 +82,8 @@ typedef bus_addr_t resource_size_t;
typedef paddr_t phys_addr_t;
+typedef bus_addr_t dma_addr_t;
+
/* XXX Is this the right type? */
typedef unsigned long long cycles_t;
Index: src/sys/external/bsd/drm2/include/linux/dma-mapping.h
diff -u src/sys/external/bsd/drm2/include/linux/dma-mapping.h:1.6 src/sys/external/bsd/drm2/include/linux/dma-mapping.h:1.7
--- src/sys/external/bsd/drm2/include/linux/dma-mapping.h:1.6 Sun Dec 19 00:25:41 2021
+++ src/sys/external/bsd/drm2/include/linux/dma-mapping.h Sun Dec 19 01:42:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dma-mapping.h,v 1.6 2021/12/19 00:25:41 riastradh Exp $ */
+/* $NetBSD: dma-mapping.h,v 1.7 2021/12/19 01:42:10 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <machine/limits.h>
-typedef bus_addr_t dma_addr_t;
+#include <linux/types.h>
static inline uintmax_t
DMA_BIT_MASK(unsigned nbits)
