Module Name: src
Committed By: cherry
Date: Mon Jul 25 17:29:43 UTC 2011
Modified Files:
src/sys/arch/xen/xen [cherry-xenmp]: clock.c
Log Message:
Do not register the same callback more than once.
To generate a diff of this commit:
cvs rdiff -u -r1.54.6.1 -r1.54.6.2 src/sys/arch/xen/xen/clock.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/arch/xen/xen/clock.c
diff -u src/sys/arch/xen/xen/clock.c:1.54.6.1 src/sys/arch/xen/xen/clock.c:1.54.6.2
--- src/sys/arch/xen/xen/clock.c:1.54.6.1 Fri Jun 3 13:27:42 2011
+++ src/sys/arch/xen/xen/clock.c Mon Jul 25 17:29:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.54.6.1 2011/06/03 13:27:42 cherry Exp $ */
+/* $NetBSD: clock.c,v 1.54.6.2 2011/07/25 17:29:43 cherry Exp $ */
/*
*
@@ -29,7 +29,7 @@
#include "opt_xen.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.54.6.1 2011/06/03 13:27:42 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.54.6.2 2011/07/25 17:29:43 cherry Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -452,7 +452,9 @@
"hardclock");
#ifdef DOM0OPS
- callout_init(&xen_timepush_co, 0);
+ if (!tcdone) { /* Do this only once */
+ callout_init(&xen_timepush_co, 0);
+ }
#endif
evtch = bind_virq_to_evtch(VIRQ_TIMER);
aprint_verbose("Xen clock: using event channel %d\n", evtch);
