Module Name: src
Committed By: pgoyette
Date: Wed Sep 22 00:13:55 UTC 2010
Modified Files:
src/sys/dev/sysmon: sysmon_envsys_events.c
Log Message:
1. Don't try to call the driver's get_limits routine if it doesn't have
one. Fixes a panic reported by njoly@ in private Email
2. Acquire the device before checking whether or not the get_limits
routine exists.
XXX There's still a bug in here somewhere that prevents setting of
XXX limit values after using 'envstat -S'
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/sysmon/sysmon_envsys_events.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/dev/sysmon/sysmon_envsys_events.c
diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.92 src/sys/dev/sysmon/sysmon_envsys_events.c:1.93
--- src/sys/dev/sysmon/sysmon_envsys_events.c:1.92 Sat Apr 10 19:01:01 2010
+++ src/sys/dev/sysmon/sysmon_envsys_events.c Wed Sep 22 00:13:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.92 2010/04/10 19:01:01 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.93 2010/09/22 00:13:55 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.92 2010/04/10 19:01:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.93 2010/09/22 00:13:55 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -546,12 +546,12 @@
{
int err;
+ sysmon_envsys_acquire(sme, false);
if (sme->sme_get_limits == NULL ||
(edata->flags & ENVSYS_FMONLIMITS) == 0)
- return EINVAL;
-
- sysmon_envsys_acquire(sme, false);
- err = sme_update_limits(sme, edata);
+ err = EINVAL;
+ else
+ err = sme_update_limits(sme, edata);
sysmon_envsys_release(sme, false);
return err;
@@ -595,8 +595,9 @@
if (see == NULL)
return EINVAL;
- /* Get new limit values */
- (*sme->sme_get_limits)(sme, edata, &lims, &props);
+ /* Update limit values from driver if possible */
+ if (sme->sme_get_limits != NULL)
+ (*sme->sme_get_limits)(sme, edata, &lims, &props);
/* Update event and dictionary */
sme_event_register(sdict, edata, sme, &lims, props,
