genirq: Streamline irq_action

There is no need to have flags as unsigned long. Make it unsigned int
and put it together with irq so it does not waste space on 64 bit.
Make irq unsigned int while at it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 2aea5d22db07bc08a9bd0071ac49b7ab59ab592c..c91171599cb68825709aa12a9d79e80026bd9dfb 100644 (file)
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -93,27 +93,27 @@ typedef irqreturn_t (*irq_handler_t)(int, void *);
 /**
  * struct irqaction - per interrupt action descriptor
  * @handler:   interrupt handler function
- * @flags:     flags (see IRQF_* above)
  * @name:      name of the device
  * @dev_id:    cookie to identify the device
  * @percpu_dev_id:     cookie to identify the device
  * @next:      pointer to the next irqaction for shared interrupts
  * @irq:       interrupt number
- * @dir:       pointer to the proc/irq/NN/name entry
+ * @flags:     flags (see IRQF_* above)
  * @thread_fn: interrupt handler function for threaded interrupts
  * @thread:    thread pointer for threaded interrupts
  * @thread_flags:      flags related to @thread
  * @thread_mask:       bitmask for keeping track of @thread activity
+ * @dir:       pointer to the proc/irq/NN/name entry
  */
 struct irqaction {
        irq_handler_t           handler;
-       unsigned long           flags;
        void                    *dev_id;
        void __percpu           *percpu_dev_id;
        struct irqaction        *next;
-       int                     irq;
        irq_handler_t           thread_fn;
        struct task_struct      *thread;
+       unsigned int            irq;
+       unsigned int            flags;
        unsigned long           thread_flags;
        unsigned long           thread_mask;
        const char              *name;