Module Name: src Committed By: christos Date: Wed Nov 12 04:53:14 UTC 2014
Modified Files: src/sys/external/bsd/drm2/drm: drm_sysctl.c src/sys/external/bsd/drm2/include/linux: moduleparam.h Log Message: fix description setting. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/drm_sysctl.c cvs rdiff -u -r1.3 -r1.4 \ 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.2 src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.3 --- src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.2 Tue Nov 11 22:14:00 2014 +++ src/sys/external/bsd/drm2/drm/drm_sysctl.c Tue Nov 11 23:53:13 2014 @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: drm_sysctl.c,v 1.2 2014/11/12 03:14:00 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_sysctl.c,v 1.3 2014/11/12 04:53:13 christos Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -48,7 +48,7 @@ drm_sysctl_get_description(const struct for (; b < e; b++) { const struct linux_module_param_desc *d = *b; - if (strcmp(p->name, d->name) == 0) + if (strcmp(p->dname, d->name) == 0) return d->description; } return NULL; Index: src/sys/external/bsd/drm2/include/linux/moduleparam.h diff -u src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.3 src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.4 --- src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.3 Tue Nov 11 21:24:40 2014 +++ src/sys/external/bsd/drm2/include/linux/moduleparam.h Tue Nov 11 23:53:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: moduleparam.h,v 1.3 2014/11/12 02:24:40 christos Exp $ */ +/* $NetBSD: moduleparam.h,v 1.4 2014/11/12 04:53:14 christos Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -35,10 +35,11 @@ #include <sys/types.h> struct linux_module_param_info { - const char *name; - void *ptr; - int type; - mode_t mode; + const char *dname; // Name used for description + const char *name; // Name for sysctl + void *ptr; // Pointer to variable value + int type; // MTYPE_ + mode_t mode; // 600 (rw) or 400 (r) }; #define MTYPE_int 0 @@ -46,6 +47,7 @@ struct linux_module_param_info { #define module_param_named(NAME, VAR, TYPE, MODE) \ static __attribute__((__used__)) struct linux_module_param_info info_ ## NAME = { \ + .dname = # NAME, \ .name = # VAR, \ .ptr = & VAR, \ .type = MTYPE_ ## TYPE, \