Pull acpi_os_free into release branch

2006-07-01 17:19:08 -04:00
parent fc25465f09 02438d8771
commit b197ba3c70
19 changed files with 36 additions and 45 deletions
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -466,7 +466,7 @@ static acpi_status is_memory_device(acpi_handle handle)

 	info = buffer.pointer;
 	if (!(info->valid & ACPI_VALID_HID)) {
-		acpi_os_free(buffer.pointer);
+		kfree(buffer.pointer);
 		return AE_ERROR;
 	}

@@ -475,7 +475,7 @@ static acpi_status is_memory_device(acpi_handle handle)
 	    (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID)))
 		status = AE_ERROR;

-	acpi_os_free(buffer.pointer);
+	kfree(buffer.pointer);
 	return status;
 }