aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches/bugfix/m68k/irq_lockdep.diff
blob: 1d3542fa64c4da37a8100645d047157bff928cdb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
Subject: [PATCH] lockdep: Add missing disable/enable irq variant

From: Roman Zippel <zippel@linux-m68k.org>

Add missing disable/enable irq variant

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 include/linux/interrupt.h |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- linux-m68k-2.6.21.orig/include/linux/interrupt.h
+++ linux-m68k-2.6.21/include/linux/interrupt.h
@@ -185,10 +185,14 @@ static inline int disable_irq_wake(unsig
  * 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 */