Module Name: src Committed By: christos Date: Wed Oct 16 15:01:10 UTC 2019
Modified Files: src/sys/arch/x86/isa: clock.c src/sys/arch/xen/xen: clock.c Log Message: add void * casts for the clock interrupt handlers. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x86/isa/clock.c cvs rdiff -u -r1.78 -r1.79 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/x86/isa/clock.c diff -u src/sys/arch/x86/isa/clock.c:1.34 src/sys/arch/x86/isa/clock.c:1.35 --- src/sys/arch/x86/isa/clock.c:1.34 Fri Feb 15 03:54:01 2019 +++ src/sys/arch/x86/isa/clock.c Wed Oct 16 11:01:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.34 2019/02/15 08:54:01 nonaka Exp $ */ +/* $NetBSD: clock.c,v 1.35 2019/10/16 15:01:10 christos Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -121,7 +121,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.34 2019/02/15 08:54:01 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.35 2019/10/16 15:01:10 christos Exp $"); /* #define CLOCKDEBUG */ /* #define CLOCK_PARANOIA */ @@ -554,7 +554,7 @@ i8254_initclocks(void) * want to keep track of clock handlers. */ (void)isa_intr_establish(NULL, 0, IST_PULSE, IPL_CLOCK, - (int (*)(void *))clockintr, 0); + (int (*)(void *))(void *)clockintr, 0); } void Index: src/sys/arch/xen/xen/clock.c diff -u src/sys/arch/xen/xen/clock.c:1.78 src/sys/arch/xen/xen/clock.c:1.79 --- src/sys/arch/xen/xen/clock.c:1.78 Sat Mar 9 04:51:29 2019 +++ src/sys/arch/xen/xen/clock.c Wed Oct 16 11:01:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.78 2019/03/09 09:51:29 kre Exp $ */ +/* $NetBSD: clock.c,v 1.79 2019/10/16 15:01:10 christos Exp $ */ /*- * Copyright (c) 2017, 2018 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ #endif #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.78 2019/03/09 09:51:29 kre Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.79 2019/10/16 15:01:10 christos Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -763,9 +763,9 @@ xen_resumeclocks(struct cpu_info *ci) snprintf(intr_xname, sizeof(intr_xname), "%s clock", device_xname(ci->ci_dev)); /* XXX sketchy function pointer cast -- fix the API, please */ - ci->ci_xen_timer_intrhand = xen_intr_establish_xname(-1, &xen_pic, evtch, - IST_LEVEL, IPL_CLOCK, (int (*)(void *))xen_timer_handler, ci, true, - intr_xname); + ci->ci_xen_timer_intrhand = xen_intr_establish_xname(-1, &xen_pic, + evtch, IST_LEVEL, IPL_CLOCK, + (int (*)(void *))(void *)xen_timer_handler, ci, true, intr_xname); if (ci->ci_xen_timer_intrhand == NULL) panic("failed to establish timer interrupt handler");