Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:49:52 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include/linux: io.h
src/sys/external/bsd/drm2/linux: linux_writecomb.c
Log Message:
phys_wc_to_mtrr_index got renamed to arch_phys_wc_index upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/io.h
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/linux/linux_writecomb.c
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.h
diff -u src/sys/external/bsd/drm2/include/linux/io.h:1.4 src/sys/external/bsd/drm2/include/linux/io.h:1.5
--- src/sys/external/bsd/drm2/include/linux/io.h:1.4 Wed Jul 16 20:59:58 2014
+++ src/sys/external/bsd/drm2/include/linux/io.h Mon Aug 27 06:49:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: io.h,v 1.4 2014/07/16 20:59:58 riastradh Exp $ */
+/* $NetBSD: io.h,v 1.5 2018/08/27 06:49:52 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -43,6 +43,6 @@ void linux_writecomb_fini(void);
int arch_phys_wc_add(unsigned long, unsigned long);
void arch_phys_wc_del(int);
-int phys_wc_to_mtrr_index(int);
+int arch_phys_wc_index(int);
#endif /* _LINUX_IO_H_ */
Index: src/sys/external/bsd/drm2/linux/linux_writecomb.c
diff -u src/sys/external/bsd/drm2/linux/linux_writecomb.c:1.6 src/sys/external/bsd/drm2/linux/linux_writecomb.c:1.7
--- src/sys/external/bsd/drm2/linux/linux_writecomb.c:1.6 Tue Aug 14 14:53:21 2018
+++ src/sys/external/bsd/drm2/linux/linux_writecomb.c Mon Aug 27 06:49:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_writecomb.c,v 1.6 2018/08/14 14:53:21 riastradh Exp $ */
+/* $NetBSD: linux_writecomb.c,v 1.7 2018/08/27 06:49:52 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_writecomb.c,v 1.6 2018/08/14 14:53:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_writecomb.c,v 1.7 2018/08/27 06:49:52 riastradh Exp $");
#if defined(__i386__) || defined(__x86_64__)
#define HAS_MTRR 1
@@ -151,7 +151,7 @@ arch_phys_wc_del(int id)
}
int
-phys_wc_to_mtrr_index(int handle)
+arch_phys_wc_index(int handle)
{
/* XXX Actually implement this...requires changes to our MTRR API. */
