From 286d66b0b6e63010ae62eb672700ec2713b005a6 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 3 Jul 2006 00:24:27 -0700 Subject: [PATCH] --- yaml --- r: 31768 b: refs/heads/master c: d7e9629de051bb4b1d104588cd97673ad770809e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/interrupt.h | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c1bec2b4e828..df8e48cb5636 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c01d403b2e3e3f231b18ebd07ad64ecbe6a258a5 +refs/heads/master: d7e9629de051bb4b1d104588cd97673ad770809e diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h index 2c5452c1d7bb..73463fbb38e4 100644 --- a/trunk/include/linux/interrupt.h +++ b/trunk/include/linux/interrupt.h @@ -80,6 +80,23 @@ extern int request_irq(unsigned int, unsigned long, const char *, void *); extern void free_irq(unsigned int, void *); +/* + * On lockdep we dont want to enable hardirqs in hardirq + * context. Use local_irq_enable_in_hardirq() to annotate + * kernel code that has to do this nevertheless (pretty much + * the only valid case is for old/broken hardware that is + * insanely slow). + * + * NOTE: in theory this might break fragile code that relies + * on hardirq delivery - in practice we dont seem to have such + * places left. So the only effect should be slightly increased + * irqs-off latencies. + */ +#ifdef CONFIG_LOCKDEP +# define local_irq_enable_in_hardirq() do { } while (0) +#else +# define local_irq_enable_in_hardirq() local_irq_enable() +#endif #ifdef CONFIG_GENERIC_HARDIRQS extern void disable_irq_nosync(unsigned int irq);