x86, ioapic: Restore ioapic entries during resume properly

In mask/restore_ioapic_entries() we should be restoring ioapic
entries when ioapics[apic].saved_registers is not NULL.

Fix the typo and address the resume hang regression reported by
Linus.

This was not found sooner because the systems where these
changes were tested on kept the IO-APIC entries intact over
resume.

Reported-and-tested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Daniel J Blueman <daniel.blueman@gmail.com>
Link: http://lkml.kernel.org/r/1306259131.7171.7.camel@sbsiddha-MOBL3.sc.intel.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 9488dcff7aec8261b994076cdd59638da5097f73..e5293394b548426b2ec26f577825d71fe73465c0 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -676,7 +676,7 @@ void mask_ioapic_entries(void)
        int apic, pin;
 
        for (apic = 0; apic < nr_ioapics; apic++) {
-               if (ioapics[apic].saved_registers)
+               if (!ioapics[apic].saved_registers)
                        continue;
 
                for (pin = 0; pin < ioapics[apic].nr_registers; pin++) {
@@ -699,7 +699,7 @@ int restore_ioapic_entries(void)
        int apic, pin;
 
        for (apic = 0; apic < nr_ioapics; apic++) {
-               if (ioapics[apic].saved_registers)
+               if (!ioapics[apic].saved_registers)
                        continue;
 
                for (pin = 0; pin < ioapics[apic].nr_registers; pin++)