From dffc54b35a5440e635038b43ee2d375cd5a5095b Mon Sep 17 00:00:00 2001 From: Roman Zippel Date: Tue, 1 May 2007 22:32:42 +0200 Subject: [PATCH] --- yaml --- r: 53280 b: refs/heads/master c: b3e2fd9cebcf4e82d0306fe7e796eeca5aac0614 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/interrupt.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 888a6497bac6..8300cd4be7b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39ad2cb352729a8b57803737905caae1e1d1942a +refs/heads/master: b3e2fd9cebcf4e82d0306fe7e796eeca5aac0614 diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h index 838cf5a5bd7f..0319f665dd3f 100644 --- a/trunk/include/linux/interrupt.h +++ b/trunk/include/linux/interrupt.h @@ -185,10 +185,14 @@ static inline int disable_irq_wake(unsigned int irq) * validator need to define the methods below in their asm/irq.h * files, under an #ifdef CONFIG_LOCKDEP section. */ -# ifndef CONFIG_LOCKDEP +#ifndef CONFIG_LOCKDEP # define disable_irq_nosync_lockdep(irq) disable_irq_nosync(irq) +# define disable_irq_nosync_lockdep_irqsave(irq, flags) \ + disable_irq_nosync(irq) # define disable_irq_lockdep(irq) disable_irq(irq) # define enable_irq_lockdep(irq) enable_irq(irq) +# define enable_irq_lockdep_irqrestore(irq, flags) \ + enable_irq(irq) # endif #endif /* CONFIG_GENERIC_HARDIRQS */