From 90e3387e54a9150fc8614e222687d94fef20dc1c Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Mon, 17 Nov 2003 06:08:10 +0000 Subject: [PATCH] Expand the argument to the ithread enable/disable helper hooks from an int to something big enough to hold a pointer. amd64 needs this. --- sys/kern/kern_intr.c | 6 +++--- sys/sys/interrupt.h | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 0e05df889582..e42cd10385cc 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$"); struct int_entropy { struct proc *proc; - int vector; + uintptr_t vector; }; void *vm_ih; @@ -169,8 +169,8 @@ ithread_update(struct ithd *ithd) } int -ithread_create(struct ithd **ithread, int vector, int flags, - void (*disable)(int), void (*enable)(int), const char *fmt, ...) +ithread_create(struct ithd **ithread, uintptr_t vector, int flags, + void (*disable)(uintptr_t), void (*enable)(uintptr_t), const char *fmt, ...) { struct ithd *ithd; struct thread *td; diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h index cdf829d08585..63e9bac3405a 100644 --- a/sys/sys/interrupt.h +++ b/sys/sys/interrupt.h @@ -67,12 +67,12 @@ struct ithd { LIST_ENTRY(ithd) it_list; /* All interrupt threads. */ TAILQ_HEAD(, intrhand) it_handlers; /* Interrupt handlers. */ struct ithd *it_interrupted; /* Who we interrupted. */ - void (*it_disable)(int); /* Enable interrupt source. */ - void (*it_enable)(int); /* Disable interrupt source. */ + void (*it_disable)(uintptr_t); /* Enable interrupt source. */ + void (*it_enable)(uintptr_t); /* Disable interrupt source. */ void *it_md; /* Hook for MD interrupt code. */ int it_flags; /* Interrupt-specific flags. */ int it_need; /* Needs service. */ - int it_vector; + uintptr_t it_vector; char it_name[MAXCOMLEN + 1]; }; @@ -114,9 +114,9 @@ extern char intrnames[]; /* string table containing device names */ #ifdef DDB void db_dump_ithread(struct ithd *ithd, int handlers); #endif -int ithread_create(struct ithd **ithread, int vector, int flags, - void (*disable)(int), void (*enable)(int), const char *fmt, ...) - __printflike(6, 7); +int ithread_create(struct ithd **ithread, uintptr_t vector, int flags, + void (*disable)(uintptr_t), void (*enable)(uintptr_t), + const char *fmt, ...) __printflike(6, 7); int ithread_destroy(struct ithd *ithread); u_char ithread_priority(enum intr_type flags); int ithread_add_handler(struct ithd *ithread, const char *name,