APIC is not properly suspending in 2.5.67 on UP

Pavel Machek (pavel@ucw.cz)
Sat, 12 Apr 2003 23:47:01 +0200


Hi!

This is needed otherwise APIC thinks it is not active, does not
suspend properly, and kills machine. Extra whitespace killed (looks
ugly). Please apply,
Pavel

%patch
Index: linux/arch/i386/kernel/apic.c
===================================================================
--- linux.orig/arch/i386/kernel/apic.c 2003-04-08 13:19:44.000000000 +0200
+++ linux/arch/i386/kernel/apic.c 2003-04-12 23:38:21.000000000 +0200
@@ -449,6 +449,7 @@

if (nmi_watchdog == NMI_LOCAL_APIC)
setup_apic_nmi_watchdog();
+ apic_pm_activate();
}

#ifdef CONFIG_PM
@@ -652,9 +653,7 @@
nmi_watchdog = NMI_LOCAL_APIC;

printk("Found and enabled local APIC!\n");
-
apic_pm_activate();
-
return 0;

no_apic:
@@ -1133,11 +1132,8 @@
}

verify_local_APIC();
-
connect_bsp_APIC();
-
phys_cpu_present_map = 1 << boot_cpu_physical_apicid;
-
setup_local_APIC();

if (nmi_watchdog == NMI_LOCAL_APIC)
@@ -1148,6 +1144,5 @@
setup_IO_APIC();
#endif
setup_boot_APIC_clock();
-
return 0;
}

%diffstat
apic.c | 7 +------
1 files changed, 1 insertion(+), 6 deletions(-)

-- 
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/