Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:25:28 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: io-mapping.h
Log Message:
io_mapping_map_wc takes a size argument now. Must be PAGE_SIZE.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/include/linux/io-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/drm2/include/linux/io-mapping.h
diff -u src/sys/external/bsd/drm2/include/linux/io-mapping.h:1.5 src/sys/external/bsd/drm2/include/linux/io-mapping.h:1.6
--- src/sys/external/bsd/drm2/include/linux/io-mapping.h:1.5 Wed Feb 25 14:02:43 2015
+++ src/sys/external/bsd/drm2/include/linux/io-mapping.h Sun Dec 19 01:25:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: io-mapping.h,v 1.5 2015/02/25 14:02:43 riastradh Exp $ */
+/* $NetBSD: io-mapping.h,v 1.6 2021/12/19 01:25:28 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -100,10 +100,12 @@ io_mapping_free(struct io_mapping *mappi
}
static inline void *
-io_mapping_map_wc(struct io_mapping *mapping, unsigned long offset)
+io_mapping_map_wc(struct io_mapping *mapping, bus_addr_t offset,
+ bus_size_t size)
{
paddr_t cookie;
+ KASSERT(size == PAGE_SIZE);
KASSERT(0 == (offset & (PAGE_SIZE - 1)));
KASSERT(PAGE_SIZE <= mapping->diom_size);
KASSERT(offset <= (mapping->diom_size - PAGE_SIZE));
@@ -140,7 +142,7 @@ static inline void *
io_mapping_map_atomic_wc(struct io_mapping *mapping, unsigned long offset)
{
- return io_mapping_map_wc(mapping, offset);
+ return io_mapping_map_wc(mapping, offset, PAGE_SIZE);
}
static inline void
