Merge branch 'linus' into irq/threaded

[mv-sheeva.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index b94f3541f67be00802c28f22fa5b56f9e8c91e55..c96140210d1c4286cdd249e936e07e103689cbd3 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1294,6 +1294,11 @@ struct task_struct {
 /* Protection of (de-)allocation: mm, files, fs, tty, keyrings */
        spinlock_t alloc_lock;
 
+#ifdef CONFIG_GENERIC_HARDIRQS
+       /* IRQ handler threads */
+       struct irqaction *irqaction;
+#endif
+
        /* Protection of the PI data structures: */
        spinlock_t pi_lock;