---

yaml
---
r: 348339
b: refs/heads/master
c: 8611ea5
h: refs/heads/master
i:
  348337: f5bef9b
  348335: b2c6b57
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6780aa683d4d83ed887dd07b7987947d339d76f1
+refs/heads/master: 8611ea5f5d708d60ab29ed3cdb33e67168404fc0

trunk/drivers/acpi/acpi_memhotplug.c

@@ -226,16 +226,6 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
 	struct acpi_memory_info *info;
 	int node;
 
-
-	/* Get the range from the _CRS */
-	result = acpi_memory_get_device_resources(mem_device);
-	if (result) {
-		dev_err(&mem_device->device->dev,
-			"get_device_resources failed\n");
-		mem_device->state = MEMORY_INVALID_STATE;
-		return result;
-	}
-
 	node = acpi_get_node(mem_device->device->handle);
 	/*
 	 * Tell the VM there is more memory here...
@@ -342,14 +332,6 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
 			break;
 		}
 
-		if (acpi_memory_check_device(mem_device))
-			break;
-
-		if (acpi_memory_enable_device(mem_device)) {
-			acpi_handle_err(handle,"Cannot enable memory device\n");
-			break;
-		}
-
 		ost_code = ACPI_OST_SC_SUCCESS;
 		break;