1 files changed, 15 insertions, 7 deletions

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index a157b666ac36..654b69b836b6 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -237,6 +237,19 @@ static struct irq_pin_list *alloc_irq_pin_list(int node)
         return kzalloc_node(sizeof(struct irq_pin_list), GFP_KERNEL, node);
 }
 
+static void alloc_ioapic_saved_registers(int idx)
+{
+        size_t size;
+
+        if (ioapics[idx].saved_registers)
+                return;
+
+        size = sizeof(struct IO_APIC_route_entry) * ioapics[idx].nr_registers;
+        ioapics[idx].saved_registers = kzalloc(size, GFP_KERNEL);
+        if (!ioapics[idx].saved_registers)
+                pr_err("IOAPIC %d: suspend/resume impossible!\n", idx);
+}
+
 int __init arch_early_irq_init(void)
 {
         struct irq_cfg *cfg;
@@ -245,13 +258,8 @@ int __init arch_early_irq_init(void)
         if (!nr_legacy_irqs())
                 io_apic_irqs = ~0UL;
 
-        for_each_ioapic(i) {
-                ioapics[i].saved_registers =
-                        kzalloc(sizeof(struct IO_APIC_route_entry) *
-                                ioapics[i].nr_registers, GFP_KERNEL);
-                if (!ioapics[i].saved_registers)
-                        pr_err("IOAPIC %d: suspend/resume impossible!\n", i);
-        }
+        for_each_ioapic(i)
+                alloc_ioapic_saved_registers(i);
 
         /*
          * For legacy IRQ's, start with assigning irq0 to irq15 to