Patched in Tegra support.

1 files changed, 34 insertions, 4 deletions

diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index 624ef3f45c8..f743883f769 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -4,7 +4,6 @@
 #include <linux/preempt.h>
 #include <linux/lockdep.h>
 #include <linux/ftrace_irq.h>
-#include <linux/vtime.h>
 #include <asm/hardirq.h>
 
 /*
@@ -23,7 +22,7 @@
  *
  * - bits 16-25 are the hardirq count (max # of nested hardirqs: 1024)
  * - bit 26 is the NMI_MASK
- * - bit 27 is the PREEMPT_ACTIVE flag
+ * - bit 28 is the PREEMPT_ACTIVE flag
  *
  * PREEMPT_MASK: 0x000000ff
  * SOFTIRQ_MASK: 0x0000ff00
@@ -130,7 +129,30 @@ extern void synchronize_irq(unsigned int irq);
 # define synchronize_irq(irq)   barrier()
 #endif
 
+struct task_struct;
+
+#if !defined(CONFIG_VIRT_CPU_ACCOUNTING) && !defined(CONFIG_IRQ_TIME_ACCOUNTING)
+static inline void account_system_vtime(struct task_struct *tsk)
+{
+}
+#else
+extern void account_system_vtime(struct task_struct *tsk);
+#endif
+
+#if defined(CONFIG_NO_HZ)
 #if defined(CONFIG_TINY_RCU) || defined(CONFIG_TINY_PREEMPT_RCU)
+extern void rcu_enter_nohz(void);
+extern void rcu_exit_nohz(void);
+
+static inline void rcu_irq_enter(void)
+{
+        rcu_exit_nohz();
+}
+
+static inline void rcu_irq_exit(void)
+{
+        rcu_enter_nohz();
+}
 
 static inline void rcu_nmi_enter(void)
 {
@@ -141,9 +163,17 @@ static inline void rcu_nmi_exit(void)
 }
 
 #else
+extern void rcu_irq_enter(void);
+extern void rcu_irq_exit(void);
 extern void rcu_nmi_enter(void);
 extern void rcu_nmi_exit(void);
 #endif
+#else
+# define rcu_irq_enter() do { } while (0)
+# define rcu_irq_exit() do { } while (0)
+# define rcu_nmi_enter() do { } while (0)
+# define rcu_nmi_exit() do { } while (0)
+#endif /* #if defined(CONFIG_NO_HZ) */
 
 /*
  * It is safe to do non-atomic ops on ->hardirq_context,
@@ -153,7 +183,7 @@ extern void rcu_nmi_exit(void);
  */
 #define __irq_enter()                                   \
         do {                                            \
-                vtime_account_irq_enter(current);       \
+                account_system_vtime(current);          \
                 add_preempt_count(HARDIRQ_OFFSET);      \
                 trace_hardirq_enter();                  \
         } while (0)
@@ -169,7 +199,7 @@ extern void irq_enter(void);
 #define __irq_exit()                                    \
         do {                                            \
                 trace_hardirq_exit();                   \
-                vtime_account_irq_exit(current);        \
+                account_system_vtime(current);          \
                 sub_preempt_count(HARDIRQ_OFFSET);      \
         } while (0)