Merge branch 'irq/for-x86' into irq/core

[cascardo/linux.git] / kernel / irq / irqdesc.c

diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index b18d3f1..4afc457 100644 (file)
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -614,7 +614,7 @@ unsigned int kstat_irqs(unsigned int irq)
 {
        struct irq_desc *desc = irq_to_desc(irq);
        int cpu;
-       int sum = 0;
+       unsigned int sum = 0;
 
        if (!desc || !desc->kstat_irqs)
                return 0;
@@ -634,7 +634,7 @@ unsigned int kstat_irqs(unsigned int irq)
  */
 unsigned int kstat_irqs_usr(unsigned int irq)
 {
-       int sum;
+       unsigned int sum;
 
        irq_lock_sparse();
        sum = kstat_irqs(irq);