Merge branch 'x86/irq' into x86/apic

Merge reason:
	Conflicts in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
	arch/x86/kernel/apic/io_apic.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index c6c0c41af35f..9717081c75ad 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -256,9 +256,9 @@ extern struct hd_struct *disk_map_sector_rcu(struct gendisk *disk,
 #define part_stat_read(part, field)                                     \
 ({                                                                      \
         typeof((part)->dkstats->field) res = 0;                         \
-        int i;                                                          \
-        for_each_possible_cpu(i)                                        \
-                res += per_cpu_ptr((part)->dkstats, i)->field;          \
+        unsigned int _cpu;                                              \
+        for_each_possible_cpu(_cpu)                                     \
+                res += per_cpu_ptr((part)->dkstats, _cpu)->field;       \
         res;                                                            \
 })