Merge tag 'v3.9-rc3' into drm-intel-next-queued

Backmerge so that I can merge Imre Deak's coalesced sg entries fixes,
which depend upon the new for_each_sg_page introduce in

commit a321e91b6d73ed011ffceed384c40d2785cf723b
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Feb 27 17:02:56 2013 -0800

    lib/scatterlist: add simple page iterator

The merge itself is just two trivial conflicts:

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 4 insertions, 6 deletions

diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index 624ef3f45c8e..c1d6555d2567 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -118,10 +118,8 @@
 
 #ifdef CONFIG_PREEMPT_COUNT
 # define preemptible()  (preempt_count() == 0 && !irqs_disabled())
-# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1)
 #else
 # define preemptible()  0
-# define IRQ_EXIT_OFFSET HARDIRQ_OFFSET
 #endif
 
 #if defined(CONFIG_SMP) || defined(CONFIG_GENERIC_HARDIRQS)
@@ -153,7 +151,7 @@ extern void rcu_nmi_exit(void);
  */
 #define __irq_enter()                                   \
         do {                                            \
-                vtime_account_irq_enter(current);       \
+                account_irq_enter_time(current);        \
                 add_preempt_count(HARDIRQ_OFFSET);      \
                 trace_hardirq_enter();                  \
         } while (0)
@@ -169,7 +167,7 @@ extern void irq_enter(void);
 #define __irq_exit()                                    \
         do {                                            \
                 trace_hardirq_exit();                   \
-                vtime_account_irq_exit(current);        \
+                account_irq_exit_time(current);         \
                 sub_preempt_count(HARDIRQ_OFFSET);      \
         } while (0)
 
@@ -180,10 +178,10 @@ extern void irq_exit(void);
 
 #define nmi_enter()                                             \
         do {                                                    \
+                lockdep_off();                                  \
                 ftrace_nmi_enter();                             \
                 BUG_ON(in_nmi());                               \
                 add_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET); \
-                lockdep_off();                                  \
                 rcu_nmi_enter();                                \
                 trace_hardirq_enter();                          \
         } while (0)
@@ -192,10 +190,10 @@ extern void irq_exit(void);
         do {                                                    \
                 trace_hardirq_exit();                           \
                 rcu_nmi_exit();                                 \
-                lockdep_on();                                   \
                 BUG_ON(!in_nmi());                              \
                 sub_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET); \
                 ftrace_nmi_exit();                              \
+                lockdep_on();                                   \
         } while (0)
 
 #endif /* LINUX_HARDIRQ_H */