summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2018-11-21 21:07:34 +0200
committerToomas Soome <tsoome@me.com>2019-10-12 09:49:09 +0300
commit2ceb34da5f472ca531def3b536d203d345515f2a (patch)
tree69a6045eec5bf1d4c9c15a3e41681d2386314581
parent95d486fbe6ce779cf0bbaf748766b2404e3f1116 (diff)
downloadillumos-joyent-2ceb34da5f472ca531def3b536d203d345515f2a.tar.gz
11802 xencons: cast between incompatible function types
Reviewed by: Andy Stormont <astormont@racktopsystems.com> Reviewed by: Andy Fiddaman <andy@omniosce.org> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/uts/common/xen/io/xencons.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/common/xen/io/xencons.c b/usr/src/uts/common/xen/io/xencons.c
index 7862e7bbcb..f5b1772d29 100644
--- a/usr/src/uts/common/xen/io/xencons.c
+++ b/usr/src/uts/common/xen/io/xencons.c
@@ -136,7 +136,7 @@ static int xenconsgetchar(cons_polledio_arg_t);
static boolean_t xenconsischar(cons_polledio_arg_t);
static uint_t xenconsintr(caddr_t);
-static uint_t xenconsintr_priv(caddr_t);
+static uint_t xenconsintr_priv(caddr_t, caddr_t);
/*PRINTFLIKE2*/
static void xenconserror(int, const char *, ...) __KPRINTFLIKE(2);
static void xencons_soft_state_free(struct xencons *);
@@ -162,7 +162,7 @@ xenconssetup_avintr(struct xencons *xcp, int attach)
if (attach) {
/* Setup our interrupt binding. */
- (void) add_avintr(NULL, IPL_CONS, (avfunc)xenconsintr_priv,
+ (void) add_avintr(NULL, IPL_CONS, xenconsintr_priv,
"xencons", xcp->console_irq, (caddr_t)xcp, NULL, NULL,
xcp->dip);
} else {
@@ -172,7 +172,7 @@ xenconssetup_avintr(struct xencons *xcp, int attach)
* service routine is not currently executing and that it won't
* be invoked again.
*/
- (void) rem_avintr(NULL, IPL_CONS, (avfunc)xenconsintr_priv,
+ (void) rem_avintr(NULL, IPL_CONS, xenconsintr_priv,
xcp->console_irq);
}
@@ -748,7 +748,7 @@ xenconsintr(caddr_t arg)
* Console interrupt routine for priviliged domains
*/
static uint_t
-xenconsintr_priv(caddr_t arg)
+xenconsintr_priv(caddr_t arg, caddr_t arg1 __unused)
{
struct xencons *xcp = (struct xencons *)arg;