diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:26 -0400 |
| commit | 20445cc9159089d9d6b88d7864578efb10eb6590 (patch) | |
| tree | fbbb27fd8baa82c77ebc4e020e8ee9ddb57e3ae2 /drivers/acpi/osl.c | |
| parent | 4339d328631aa815fe2181b9164b3690ca2db4da (diff) | |
| parent | 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (diff) | |
| download | talos-obmc-linux-20445cc9159089d9d6b88d7864578efb10eb6590.tar.gz talos-obmc-linux-20445cc9159089d9d6b88d7864578efb10eb6590.zip | |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index bdd9f37f8101..7289da3c4db6 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -145,10 +145,14 @@ acpi_os_vprintf(const char *fmt, va_list args) #endif } +extern int acpi_in_resume; void * acpi_os_allocate(acpi_size size) { - return kmalloc(size, GFP_KERNEL); + if (acpi_in_resume) + return kmalloc(size, GFP_ATOMIC); + else + return kmalloc(size, GFP_KERNEL); } void |
