diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-11-11 23:57:36 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-11-11 23:57:36 +0100 |
| commit | 1b6bcaedcfdbed64f7d4c32861100a92976c0828 (patch) | |
| tree | a81449965b445a51de3245e6610ec61c9978dcfd | |
| parent | b32a359a60822f0190ecfde8386af720a750bdc3 (diff) | |
| parent | 1b235de8074168db2a513826df3c858e15095c83 (diff) | |
Merge branch 'master' into master-user_level_drivers
| -rw-r--r-- | linux/dev/arch/i386/kernel/irq.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/dev/arch/i386/kernel/irq.c b/linux/dev/arch/i386/kernel/irq.c index 36af3fe3..45b02992 100644 --- a/linux/dev/arch/i386/kernel/irq.c +++ b/linux/dev/arch/i386/kernel/irq.c @@ -204,9 +204,9 @@ __disable_irq (unsigned int irq_nr) save_flags (flags); cli (); - ndisabled[irq_nr]++; - assert (ndisabled[irq_nr] > 0); - if (ndisabled[irq_nr] == 1) + ndisabled_irq[irq_nr]++; + assert (ndisabled_irq[irq_nr] > 0); + if (ndisabled_irq[irq_nr] == 1) mask_irq (irq_nr); restore_flags (flags); } @@ -220,9 +220,9 @@ __enable_irq (unsigned int irq_nr) save_flags (flags); cli (); - assert (ndisabled[irq_nr] > 0); - ndisabled[irq_nr]--; - if (ndisabled[irq_nr] == 0) + assert (ndisabled_irq[irq_nr] > 0); + ndisabled_irq[irq_nr]--; + if (ndisabled_irq[irq_nr] == 0) unmask_irq (irq_nr); restore_flags (flags); } |