Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/wscons ifdef speeding ticket.
details: https://anonhg.NetBSD.org/src/rev/83f5dfdb6db6
branches: trunk
changeset: 358245:83f5dfdb6db6
user: christos <christos%NetBSD.org@localhost>
date: Mon Dec 18 22:44:30 2017 +0000
description:
ifdef speeding ticket.
diffstat:
sys/dev/wscons/wsdisplay.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diffs (29 lines):
diff -r c45e485a45fa -r 83f5dfdb6db6 sys/dev/wscons/wsdisplay.c
--- a/sys/dev/wscons/wsdisplay.c Mon Dec 18 20:32:02 2017 +0000
+++ b/sys/dev/wscons/wsdisplay.c Mon Dec 18 22:44:30 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.144 2017/12/18 18:59:32 jmcneill Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.145 2017/12/18 22:44:30 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.144 2017/12/18 18:59:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.145 2017/12/18 22:44:30 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_wsdisplay_compat.h"
@@ -369,8 +369,10 @@
}
if (scr->scr_dconf->scrdata->capabilities & WSSCREEN_FREE)
free(__UNCONST(scr->scr_dconf->scrdata), M_DEVBUF);
+#ifdef WSDISPLAY_MULTICONS
callout_halt(&scr->scr_getc_ch, NULL);
callout_destroy(&scr->scr_getc_ch);
+#endif
free(scr->scr_dconf, M_DEVBUF);
free(scr, M_DEVBUF);
}
Home |
Main Index |
Thread Index |
Old Index