diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /drivers/parisc/iosapic.c | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/parisc/iosapic.c')
| -rw-r--r-- | drivers/parisc/iosapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c index 91df0bf181dd..7a57c1b8373f 100644 --- a/drivers/parisc/iosapic.c +++ b/drivers/parisc/iosapic.c | |||
| @@ -215,7 +215,7 @@ static inline void iosapic_write(void __iomem *iosapic, unsigned int reg, u32 va | |||
| 215 | #define IOSAPIC_IRDT_ID_EID_SHIFT 0x10 | 215 | #define IOSAPIC_IRDT_ID_EID_SHIFT 0x10 |
| 216 | 216 | ||
| 217 | 217 | ||
| 218 | static spinlock_t iosapic_lock = SPIN_LOCK_UNLOCKED; | 218 | static DEFINE_SPINLOCK(iosapic_lock); |
| 219 | 219 | ||
| 220 | static inline void iosapic_eoi(void __iomem *addr, unsigned int data) | 220 | static inline void iosapic_eoi(void __iomem *addr, unsigned int data) |
| 221 | { | 221 | { |