Module Name: src
Committed By: riastradh
Date: Fri Dec 16 23:35:04 UTC 2016
Modified Files:
src/sys/kern: subr_devsw.c
src/sys/sys: conf.h
Log Message:
Fix return value of nommap.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/kern/subr_devsw.c
cvs rdiff -u -r1.149 -r1.150 src/sys/sys/conf.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/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.35 src/sys/kern/subr_devsw.c:1.36
--- src/sys/kern/subr_devsw.c:1.35 Fri Dec 9 19:13:47 2016
+++ src/sys/kern/subr_devsw.c Fri Dec 16 23:35:04 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_devsw.c,v 1.35 2016/12/09 19:13:47 nat Exp $ */
+/* $NetBSD: subr_devsw.c,v 1.36 2016/12/16 23:35:04 riastradh Exp $ */
/*-
* Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.35 2016/12/09 19:13:47 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.36 2016/12/16 23:35:04 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_dtrace.h"
@@ -1054,3 +1054,15 @@ cdev_type(dev_t dev)
return D_OTHER;
return d->d_flag & D_TYPEMASK;
}
+
+/*
+ * nommap(dev, off, prot)
+ *
+ * mmap routine that always fails, for non-mmappable devices.
+ */
+paddr_t
+nommap(dev_t dev, off_t off, int prot)
+{
+
+ return (paddr_t)-1;
+}
Index: src/sys/sys/conf.h
diff -u src/sys/sys/conf.h:1.149 src/sys/sys/conf.h:1.150
--- src/sys/sys/conf.h:1.149 Fri Dec 9 19:13:47 2016
+++ src/sys/sys/conf.h Fri Dec 16 23:35:04 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.h,v 1.149 2016/12/09 19:13:47 nat Exp $ */
+/* $NetBSD: conf.h,v 1.150 2016/12/16 23:35:04 riastradh Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -134,7 +134,7 @@ devmajor_t cdevsw_lookup_major(const str
#define nostop ((dev_type_stop((*)))enodev)
#define notty NULL
#define nopoll seltrue
-#define nommap ((dev_type_mmap((*)))enodev)
+paddr_t nommap(dev_t, off_t, int);
#define nodump ((dev_type_dump((*)))enodev)
#define nosize NULL
#define nokqfilter seltrue_kqfilter
