Module Name: src
Committed By: riastradh
Date: Wed Feb 25 14:00:52 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/drm: drm_sysctl.c
src/sys/external/bsd/drm2/include/linux: moduleparam.h
Log Message:
Add string Linux module parameters.
Needed by nouveau.
>From chs@.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/drm_sysctl.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/include/linux/moduleparam.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/drm/drm_sysctl.c
diff -u src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.4 src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.5
--- src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.4 Mon Nov 24 17:29:02 2014
+++ src/sys/external/bsd/drm2/drm/drm_sysctl.c Wed Feb 25 14:00:52 2015
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_sysctl.c,v 1.4 2014/11/24 17:29:02 prlw1 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_sysctl.c,v 1.5 2015/02/25 14:00:52 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -96,6 +96,8 @@ drm_sysctl_get_type(const struct linux_m
return CTLTYPE_BOOL;
case MTYPE_int:
return CTLTYPE_INT;
+ case MTYPE_charp:
+ return CTLTYPE_STRING;
default:
aprint_error("unhandled module param type %d for %s\n",
p->type, p->name);
Index: src/sys/external/bsd/drm2/include/linux/moduleparam.h
diff -u src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.4 src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.5
--- src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.4 Wed Nov 12 04:53:14 2014
+++ src/sys/external/bsd/drm2/include/linux/moduleparam.h Wed Feb 25 14:00:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: moduleparam.h,v 1.4 2014/11/12 04:53:14 christos Exp $ */
+/* $NetBSD: moduleparam.h,v 1.5 2015/02/25 14:00:52 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -44,6 +44,7 @@ struct linux_module_param_info {
#define MTYPE_int 0
#define MTYPE_bool 1
+#define MTYPE_charp 2
#define module_param_named(NAME, VAR, TYPE, MODE) \
static __attribute__((__used__)) struct linux_module_param_info info_ ## NAME = { \
