Module Name: src
Committed By: riastradh
Date: Mon Aug 27 13:57:24 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/drm: drm_sysctl.c
src/sys/external/bsd/drm2/include/linux: moduleparam.h
Log Message:
Teach drm_sysctl about uint, kludgily.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/drm/drm_sysctl.c
cvs rdiff -u -r1.7 -r1.8 \
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.6 src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.7
--- src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.6 Thu Jul 30 04:36:48 2015
+++ src/sys/external/bsd/drm2/drm/drm_sysctl.c Mon Aug 27 13:57:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_sysctl.c,v 1.6 2015/07/30 04:36:48 riastradh Exp $ */
+/* $NetBSD: drm_sysctl.c,v 1.7 2018/08/27 13:57:24 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_sysctl.c,v 1.6 2015/07/30 04:36:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_sysctl.c,v 1.7 2018/08/27 13:57:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -67,6 +67,8 @@ drm_sysctl_get_value(const struct linux_
return *(bool *)p->ptr;
case MTYPE_int:
return *(int *)p->ptr;
+ case MTYPE_uint:
+ return *(unsigned *)p->ptr;
default:
aprint_error("unhandled module param type %d for %s\n",
p->type, p->name);
@@ -82,6 +84,8 @@ drm_sysctl_get_size(const struct linux_m
return sizeof(bool);
case MTYPE_int:
return sizeof(int);
+ case MTYPE_uint:
+ return sizeof(unsigned);
default:
aprint_error("unhandled module param type %d for %s\n",
p->type, p->name);
@@ -100,6 +104,8 @@ drm_sysctl_get_type(const struct linux_m
return CTLTYPE_INT;
case MTYPE_charp:
return CTLTYPE_STRING;
+ case MTYPE_uint:
+ return CTLTYPE_INT; /* XXX */
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.7 src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.8
--- src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.7 Mon Aug 27 07:10:39 2018
+++ src/sys/external/bsd/drm2/include/linux/moduleparam.h Mon Aug 27 13:57:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: moduleparam.h,v 1.7 2018/08/27 07:10:39 riastradh Exp $ */
+/* $NetBSD: moduleparam.h,v 1.8 2018/08/27 13:57:24 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -45,6 +45,7 @@ struct linux_module_param_info {
#define MTYPE_int 0
#define MTYPE_bool 1
#define MTYPE_charp 2
+#define MTYPE_uint 3
#define module_param_named(NAME, VAR, TYPE, MODE) \
static __attribute__((__used__)) struct linux_module_param_info info_ ## NAME = { \
