On Sun, 16 Feb 2003 13:05:16 +0100, Pavel Machek wrote:
>> --- linux-2.5.60/arch/i386/kernel/apm.c.~1~ 2003-02-10 23:36:54.000000000 +0100
>> +++ linux-2.5.60/arch/i386/kernel/apm.c 2003-02-12 21:01:51.000000000 +0100
>> @@ -218,6 +218,7 @@
>> #include <linux/time.h>
>> #include <linux/sched.h>
>> #include <linux/pm.h>
>> +#include <linux/device.h>
>> #include <linux/kernel.h>
>> #include <linux/smp.h>
>> #include <linux/smp_lock.h>
>> @@ -1263,6 +1264,11 @@
>> }
>> printk(KERN_CRIT "apm: suspend was vetoed, but suspending anyway.\n");
>> }
>> +
>> + device_suspend(3, SUSPEND_NOTIFY);
>> + device_suspend(3, SUSPEND_SAVE_STATE);
>
>Comment these two lines... and all RESTORE_STATEs. System needs to be
>stopped in order for SAVE_STATE to work, and it is not in apm case.
What's the proper fix? apm must be able to initiate suspend & resume.
(This part is straight from your patch, BTW. I only rediffed and
and added #include <linux/device.h>.)
>> +static struct device_driver local_apic_nmi_driver = {
>> + .name = "local_apic_nmi",
>> + .bus = &system_bus_type,
>> + .resume = nmi_resume,
>> + .suspend = nmi_suspend,
>> +};
>
>Do you think it is neccessary to call it "*local_*apic_nmi_driver"? It
>seems way too long.
Local APIC != I/O APIC. I try to be a caretaker for the former,
so I dislike the ambiguous term "APIC".
>> +extern struct sys_device device_local_apic;
>> +
>> +static struct sys_device device_local_apic_nmi = {
>> + .name = "local_apic_nmi",
>> + .id = 0,
>> + .dev = {
>> + .name = "local_apic_nmi",
>> + .driver = &local_apic_nmi_driver,
>> + .parent = &device_local_apic.dev,
>> + },
>> +};
>
>Why did you convert device_apic_nmi to *sys_*device?
Otherwise the NMI watchdog device wouldn't show up in /sys.
>> +EXPORT_SYMBOL(nmi_watchdog);
>> +EXPORT_SYMBOL(disable_local_apic_nmi_watchdog);
>> +EXPORT_SYMBOL(enable_local_apic_nmi_watchdog);
>
>This is good, if we have disable_, we should have enable_, not setup_;
>but I killed _local_ part as it is way too long, then.
Note that there is also an I/O APIC NMI generator.
If you drop the "local" qualifier, things get ambiguous.
Although I find it ugly, I could accept "lapic" as a shorter
replacement for "local_apic" in identifiers.
/Mikael
-
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/
This archive was generated by hypermail 2b29 : Sun Feb 23 2003 - 22:00:14 EST