Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-microblaze.git] / include / linux / irqflags.h

diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index ceca42d..61a9ced 100644 (file)
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -58,16 +58,21 @@ do {                                                \
 } while (0)
 
 # define lockdep_hrtimer_enter(__hrtimer)              \
-         do {                                          \
-                 if (!__hrtimer->is_hard)              \
-                       current->irq_config = 1;        \
-         } while (0)
-
-# define lockdep_hrtimer_exit(__hrtimer)               \
-         do {                                          \
-                 if (!__hrtimer->is_hard)              \
+({                                                     \
+       bool __expires_hardirq = true;                  \
+                                                       \
+       if (!__hrtimer->is_hard) {                      \
+               current->irq_config = 1;                \
+               __expires_hardirq = false;              \
+       }                                               \
+       __expires_hardirq;                              \
+})
+
+# define lockdep_hrtimer_exit(__expires_hardirq)       \
+       do {                                            \
+               if (!__expires_hardirq)                 \
                        current->irq_config = 0;        \
-         } while (0)
+       } while (0)
 
 # define lockdep_posixtimer_enter()                            \
          do {                                                  \
@@ -102,8 +107,8 @@ do {                                                \
 # define lockdep_hardirq_exit()                do { } while (0)
 # define lockdep_softirq_enter()       do { } while (0)
 # define lockdep_softirq_exit()                do { } while (0)
-# define lockdep_hrtimer_enter(__hrtimer)              do { } while (0)
-# define lockdep_hrtimer_exit(__hrtimer)               do { } while (0)
+# define lockdep_hrtimer_enter(__hrtimer)      false
+# define lockdep_hrtimer_exit(__context)       do { } while (0)
 # define lockdep_posixtimer_enter()            do { } while (0)
 # define lockdep_posixtimer_exit()             do { } while (0)
 # define lockdep_irq_work_enter(__work)                do { } while (0)