diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
| commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
| tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /kernel/irq/manage.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index c911c6ec4dd6..4e461438e48b 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -410,6 +410,12 @@ int request_irq(unsigned int irq, | |||
| 410 | struct irqaction *action; | 410 | struct irqaction *action; |
| 411 | int retval; | 411 | int retval; |
| 412 | 412 | ||
| 413 | #ifdef CONFIG_LOCKDEP | ||
| 414 | /* | ||
| 415 | * Lockdep wants atomic interrupt handlers: | ||
| 416 | */ | ||
| 417 | irqflags |= SA_INTERRUPT; | ||
| 418 | #endif | ||
| 413 | /* | 419 | /* |
| 414 | * Sanity-check: shared interrupts must pass in a real dev-ID, | 420 | * Sanity-check: shared interrupts must pass in a real dev-ID, |
| 415 | * otherwise we'll have trouble later trying to figure out | 421 | * otherwise we'll have trouble later trying to figure out |