diff options
| author | Colin Yi <Colin.Yi@Sun.COM> | 2009-05-25 10:17:17 +0800 |
|---|---|---|
| committer | Colin Yi <Colin.Yi@Sun.COM> | 2009-05-25 10:17:17 +0800 |
| commit | e8bb33d8a52501da2c03bbcb5fddf3239b74ad8c (patch) | |
| tree | 94883abab6376fce3078fb698a6a0f0c2a885ca5 /usr/src/uts/common/sys | |
| parent | 81d9ccb6366881724acaad97008e11a87a8a7bd6 (diff) | |
| download | illumos-joyent-e8bb33d8a52501da2c03bbcb5fddf3239b74ad8c.tar.gz | |
6826573 System crashing while installing snv_111
Diffstat (limited to 'usr/src/uts/common/sys')
| -rw-r--r-- | usr/src/uts/common/sys/avintr.h | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/cpuvar.h | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/usr/src/uts/common/sys/avintr.h b/usr/src/uts/common/sys/avintr.h index 05078c36cd..28b95fb348 100644 --- a/usr/src/uts/common/sys/avintr.h +++ b/usr/src/uts/common/sys/avintr.h @@ -19,14 +19,13 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #ifndef _SYS_AVINTR_H #define _SYS_AVINTR_H -#pragma ident "%Z%%M% %I% %E% SMI" #include <sys/mutex.h> #include <sys/dditypes.h> @@ -97,7 +96,6 @@ extern int rem_avsoftintr(void *intr_id, int lvl, avfunc xxintr); extern int av_softint_movepri(void *intr_id, int old_lvl); extern void update_avsoftintr_args(void *intr_id, int lvl, caddr_t arg2); extern void rem_avintr(void *intr_id, int lvl, avfunc xxintr, int vect); -extern void wait_till_seen(int ipl); extern uint_t softlevel1(caddr_t, caddr_t); #endif /* _KERNEL */ diff --git a/usr/src/uts/common/sys/cpuvar.h b/usr/src/uts/common/sys/cpuvar.h index 99829bbb03..1493aa6a33 100644 --- a/usr/src/uts/common/sys/cpuvar.h +++ b/usr/src/uts/common/sys/cpuvar.h @@ -268,6 +268,20 @@ extern cpu_core_t cpu_core[]; #define CPU_ON_INTR(cpup) ((cpup)->cpu_intr_actv >> (LOCK_LEVEL + 1)) /* + * Check to see if an interrupt thread might be active at a given ipl. + * If so return true. + * We must be conservative--it is ok to give a false yes, but a false no + * will cause disaster. (But if the situation changes after we check it is + * ok--the caller is trying to ensure that an interrupt routine has been + * exited). + * This is used when trying to remove an interrupt handler from an autovector + * list in avintr.c. + */ +#define INTR_ACTIVE(cpup, level) \ + ((level) <= LOCK_LEVEL ? \ + ((cpup)->cpu_intr_actv & (1 << (level))) : (CPU_ON_INTR(cpup))) + +/* * CPU_PSEUDO_RANDOM() returns a per CPU value that changes each time one * looks at it. It's meant as a cheap mechanism to be incorporated in routines * wanting to avoid biasing, but where true randomness isn't needed (just |