diff options
author | David Shaohua Li <shaohua.li@intel.com> | 2005-08-03 23:46:33 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-03 23:50:36 -0400 |
commit | 11e981f1e02c2a36465cbb208b21cb8b6480f399 (patch) | |
tree | d812a362e9e530f0cfd7a189d79ede3e8d5a7f96 /drivers/acpi/pci_link.c | |
parent | 8066eff0a1a0703ad901dbe5646a47dbfc089ef2 (diff) |
[ACPI] S3 resume: avoid kmalloc() might_sleep oops symptom
ACPI now uses kmalloc(...,GPF_ATOMIC) during suspend/resume.
http://bugzilla.kernel.org/show_bug.cgi?id=3469
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/pci_link.c')
-rw-r--r-- | drivers/acpi/pci_link.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 65cea07abbc3..834c2ceff1aa 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
@@ -798,6 +798,11 @@ acpi_pci_link_resume( | |||
798 | return_VALUE(0); | 798 | return_VALUE(0); |
799 | } | 799 | } |
800 | 800 | ||
801 | /* | ||
802 | * FIXME: this is a workaround to avoid nasty warning. It will be removed | ||
803 | * after every device calls pci_disable_device in .resume. | ||
804 | */ | ||
805 | int acpi_in_resume; | ||
801 | static int | 806 | static int |
802 | irqrouter_resume( | 807 | irqrouter_resume( |
803 | struct sys_device *dev) | 808 | struct sys_device *dev) |
@@ -807,6 +812,7 @@ irqrouter_resume( | |||
807 | 812 | ||
808 | ACPI_FUNCTION_TRACE("irqrouter_resume"); | 813 | ACPI_FUNCTION_TRACE("irqrouter_resume"); |
809 | 814 | ||
815 | acpi_in_resume = 1; | ||
810 | list_for_each(node, &acpi_link.entries) { | 816 | list_for_each(node, &acpi_link.entries) { |
811 | link = list_entry(node, struct acpi_pci_link, node); | 817 | link = list_entry(node, struct acpi_pci_link, node); |
812 | if (!link) { | 818 | if (!link) { |
@@ -816,6 +822,7 @@ irqrouter_resume( | |||
816 | } | 822 | } |
817 | acpi_pci_link_resume(link); | 823 | acpi_pci_link_resume(link); |
818 | } | 824 | } |
825 | acpi_in_resume = 0; | ||
819 | return_VALUE(0); | 826 | return_VALUE(0); |
820 | } | 827 | } |
821 | 828 | ||