diff options
Diffstat (limited to 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index eedb05c6dc7b..47dfde95b8f8 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -136,16 +136,6 @@ void acpi_os_vprintf(const char *fmt, va_list args) | |||
| 136 | #endif | 136 | #endif |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | |||
| 140 | extern int acpi_in_resume; | ||
| 141 | void *acpi_os_allocate(acpi_size size) | ||
| 142 | { | ||
| 143 | if (acpi_in_resume) | ||
| 144 | return kmalloc(size, GFP_ATOMIC); | ||
| 145 | else | ||
| 146 | return kmalloc(size, GFP_KERNEL); | ||
| 147 | } | ||
| 148 | |||
| 149 | acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr) | 139 | acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr) |
| 150 | { | 140 | { |
| 151 | if (efi_enabled) { | 141 | if (efi_enabled) { |
| @@ -1115,26 +1105,6 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object) | |||
| 1115 | return (AE_OK); | 1105 | return (AE_OK); |
| 1116 | } | 1106 | } |
| 1117 | 1107 | ||
| 1118 | /******************************************************************************* | ||
| 1119 | * | ||
| 1120 | * FUNCTION: acpi_os_acquire_object | ||
| 1121 | * | ||
| 1122 | * PARAMETERS: Cache - Handle to cache object | ||
| 1123 | * ReturnObject - Where the object is returned | ||
| 1124 | * | ||
| 1125 | * RETURN: Status | ||
| 1126 | * | ||
| 1127 | * DESCRIPTION: Return a zero-filled object. | ||
| 1128 | * | ||
| 1129 | ******************************************************************************/ | ||
| 1130 | |||
| 1131 | void *acpi_os_acquire_object(acpi_cache_t * cache) | ||
| 1132 | { | ||
| 1133 | void *object = kmem_cache_zalloc(cache, GFP_KERNEL); | ||
| 1134 | WARN_ON(!object); | ||
| 1135 | return object; | ||
| 1136 | } | ||
| 1137 | |||
| 1138 | /****************************************************************************** | 1108 | /****************************************************************************** |
| 1139 | * | 1109 | * |
| 1140 | * FUNCTION: acpi_os_validate_interface | 1110 | * FUNCTION: acpi_os_validate_interface |
