quirk_via_irqpic() must not be __devinit for S1
Pavel,
Got this testing echo 1 > /proc/acpi/sleep on a box 2.6.12-rc5-mm1. Reference to discarded function, patch at bottom. Works nice otherwise :-)
EIP is at quirk_via_irqpic+0x1/0xc0
[<c010414f>] show_stack+0x7f/0xa0 [<c01042e6>] show_registers+0x156/0x1c0 [<c01044e0>] die+0xf0/0x1a0 [<c010463e>] do_trap+0xae/0xb0 [<c0104791>] do_int3+0x81/0x90 [<c0103f1a>] int3+0x1e/0x24 [<c01b7713>] pci_fixup_device+0x43/0x70 [<c01b6eb5>] pci_enable_device+0x35/0x40 [<c01b79ba>] pci_default_resume+0x3a/0x50 [<c01b79f2>] pci_device_resume+0x22/0x30 [<c0200a26>] resume_device+0xa6/0xb0 [<c0200ad8>] dpm_resume+0xa8/0xb0 [<c0200af4>] device_resume+0x14/0x30 [<c0131eeb>] suspend_finish+0xb/0x40 [<c0131fa5>] enter_state+0x85/0xb0 [<c013200e>] pm_suspend+0x1e/0x30 [<c01d318e>] acpi_suspend+0x2e/0x3c [<c01d3286>] acpi_system_write_sleep+0x73/0x86 [<c0155ac5>] vfs_write+0xa5/0x170 [<c0155c5b>] sys_write+0x4b/0x80 [<c01032e9>] syscall_call+0x7/0xb
Signed-off-by Alexander Nyberg <[email protected]>
drivers/pci/quirks.c +1 -1
@@ -499,7 +499,7 @@DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C586_3 , quirk_via_acpi );DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C686_4 , quirk_via_acpi ); -static void __devinit quirk_via_irqpic (struct pci_dev *dev) +static void quirk_via_irqpic (struct pci_dev *dev) {u8 irq, new_irq;
Hi!
Quoted 3 lines
Got this testing echo 1 >
/proc/acpi/sleepon a box 2.6.12-rc5-mm1. Reference to discarded function, patch at bottom. Works nice otherwise :-)
Patch looks good, but can only be applied to -mm tree, so it is not easy to merge to me. Andrew, could you apply this one?
Pavel
Quoted 16 lines
Signed-off-by Alexander Nyberg <[email protected]>Index:
akpm/drivers/pci/quirks.c
===================================================================drivers/pci/quirks.c +1
-1@@ -499,7 +499,7 @@DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C586_3 , quirk_via_acpi );DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C686_4 , quirk_via_acpi ); -static void __devinit quirk_via_irqpic (struct pci_dev *dev) +static void quirk_via_irqpic (struct pci_dev *dev) {u8 irq, new_irq;