From: Ingo Molnar Introduce local_irq_enable_in_hardirq() API. It is currently aliased to local_irq_enable(), hence has no functional effects. This API will be used by lockdep, but even without lockdep this will better document places in the kernel where a hardirq context enables hardirqs. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton --- arch/i386/kernel/nmi.c | 3 ++- arch/x86_64/kernel/nmi.c | 3 ++- drivers/ide/ide-io.c | 6 +++--- drivers/ide/ide-taskfile.c | 2 +- include/linux/ide.h | 2 +- include/linux/trace_irqflags.h | 2 ++ kernel/irq/handle.c | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff -puN arch/i386/kernel/nmi.c~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api arch/i386/kernel/nmi.c --- 25/arch/i386/kernel/nmi.c~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api 2006-05-30 06:15:18.000000000 -0600 +++ 25-akpm/arch/i386/kernel/nmi.c 2006-05-30 06:15:18.000000000 -0600 @@ -198,7 +198,8 @@ static __cpuinit inline int nmi_known_cp static __init void nmi_cpu_busy(void *data) { volatile int *endflag = data; - local_irq_enable(); + + local_irq_enable_in_hardirq(); /* Intentionally don't use cpu_relax here. This is to make sure that the performance counter really ticks, even if there is a simulator or similar that catches the diff -puN arch/x86_64/kernel/nmi.c~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api arch/x86_64/kernel/nmi.c --- 25/arch/x86_64/kernel/nmi.c~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api 2006-05-30 06:15:18.000000000 -0600 +++ 25-akpm/arch/x86_64/kernel/nmi.c 2006-05-30 06:15:18.000000000 -0600 @@ -196,7 +196,8 @@ void nmi_watchdog_default(void) static __init void nmi_cpu_busy(void *data) { volatile int *endflag = data; - local_irq_enable(); + + local_irq_enable_in_hardirq(); /* Intentionally don't use cpu_relax here. This is to make sure that the performance counter really ticks, even if there is a simulator or similar that catches the diff -puN drivers/ide/ide-io.c~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api drivers/ide/ide-io.c --- 25/drivers/ide/ide-io.c~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api 2006-05-30 06:15:18.000000000 -0600 +++ 25-akpm/drivers/ide/ide-io.c 2006-05-30 06:15:18.000000000 -0600 @@ -689,7 +689,7 @@ static ide_startstop_t drive_cmd_intr (i u8 stat = hwif->INB(IDE_STATUS_REG); int retries = 10; - local_irq_enable(); + local_irq_enable_in_hardirq(); if ((stat & DRQ_STAT) && args && args[3]) { u8 io_32bit = drive->io_32bit; drive->io_32bit = 0; @@ -1273,7 +1273,7 @@ static void ide_do_request (ide_hwgroup_ if (masked_irq != IDE_NO_IRQ && hwif->irq != masked_irq) disable_irq_nosync(hwif->irq); spin_unlock(&ide_lock); - local_irq_enable(); + local_irq_enable_in_hardirq(); /* allow other IRQs while we start this request */ startstop = start_request(drive, rq); spin_lock_irq(&ide_lock); @@ -1622,7 +1622,7 @@ irqreturn_t ide_intr (int irq, void *dev spin_unlock(&ide_lock); if (drive->unmask) - local_irq_enable(); + local_irq_enable_in_hardirq(); /* service this interrupt, may set handler for next interrupt */ startstop = handler(drive); spin_lock_irq(&ide_lock); diff -puN drivers/ide/ide-taskfile.c~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api drivers/ide/ide-taskfile.c --- 25/drivers/ide/ide-taskfile.c~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api 2006-05-30 06:15:18.000000000 -0600 +++ 25-akpm/drivers/ide/ide-taskfile.c 2006-05-30 06:15:18.000000000 -0600 @@ -223,7 +223,7 @@ ide_startstop_t task_no_data_intr (ide_d ide_hwif_t *hwif = HWIF(drive); u8 stat; - local_irq_enable(); + local_irq_enable_in_hardirq(); if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG),READY_STAT,BAD_STAT)) { return ide_error(drive, "task_no_data_intr", stat); /* calls ide_end_drive_cmd */ diff -puN include/linux/ide.h~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api include/linux/ide.h --- 25/include/linux/ide.h~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api 2006-05-30 06:15:18.000000000 -0600 +++ 25-akpm/include/linux/ide.h 2006-05-30 06:15:18.000000000 -0600 @@ -1361,7 +1361,7 @@ extern struct semaphore ide_cfg_sem; * ide_drive_t->hwif: constant, no locking */ -#define local_irq_set(flags) do { local_save_flags((flags)); local_irq_enable(); } while (0) +#define local_irq_set(flags) do { local_save_flags((flags)); local_irq_enable_in_hardirq(); } while (0) extern struct bus_type ide_bus_type; diff -puN include/linux/trace_irqflags.h~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api include/linux/trace_irqflags.h --- 25/include/linux/trace_irqflags.h~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api 2006-05-30 06:15:18.000000000 -0600 +++ 25-akpm/include/linux/trace_irqflags.h 2006-05-30 06:15:35.000000000 -0600 @@ -73,6 +73,8 @@ #define raw_local_irq_restore(flags) local_irq_restore(flags) #endif /* CONFIG_X86 */ +#define local_irq_enable_in_hardirq() local_irq_enable() + #ifdef CONFIG_X86 #define safe_halt() \ do { \ diff -puN kernel/irq/handle.c~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api kernel/irq/handle.c --- 25/kernel/irq/handle.c~lock-validator-lockdep-add-local_irq_enable_in_hardirq-api 2006-05-30 06:15:18.000000000 -0600 +++ 25-akpm/kernel/irq/handle.c 2006-05-30 06:15:18.000000000 -0600 @@ -114,7 +114,7 @@ irqreturn_t handle_IRQ_event(unsigned in unsigned int status = 0; if (!(action->flags & SA_INTERRUPT)) - local_irq_enable(); + local_irq_enable_in_hardirq(); do { ret = action->handler(irq, action->dev_id, regs); _