---

yaml --- r: 348350 b: refs/heads/master c: 56836fb h: refs/heads/master v: v3
git-mirror · Jan 3, 2013 · db91506 · db91506
1 parent 2cf4971
commit db91506
Show file tree

Hide file tree

Showing 17 changed files with 843 additions and 121 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eef2455f350708269fe42fab07b8c73efca83dc
+refs/heads/master: 56836fb4dab8fe906b934b231b04c33c180f8da5
diff --git a/trunk/drivers/acpi/acpi_memhotplug.c b/trunk/drivers/acpi/acpi_memhotplug.c
@@ -226,6 +226,16 @@ 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...
@@ -332,6 +342,14 @@ 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;
 

diff --git a/trunk/drivers/acpi/acpica/Makefile b/trunk/drivers/acpi/acpica/Makefile
@@ -162,5 +162,5 @@ acpi-y +=		\
 	utxferror.o	\
 	utxfmutex.o
 
-acpi-$(ACPI_FUTURE_USAGE) += uttrack.o utcache.o
+acpi-$(ACPI_FUTURE_USAGE) += uttrack.o utcache.o utclib.o