From 9991833e64508655770c042b36e7664ece7b545d Mon Sep 17 00:00:00 2001
From: Yasunori Goto <y-goto@jp.fujitsu.com>
Date: Tue, 27 Jun 2006 02:53:28 -0700
Subject: [PATCH] --- yaml --- r: 30719 b: refs/heads/master c:
 1f425994f96d85540d47eee98daabc1e211b454e h: refs/heads/master i:   30717:
 f3275d756d38dc7fe121de3a9b1a5a4a5395ba4a   30715:
 62aa84c1804e54b83821cefb3a5a99b6a0900228   30711:
 87b5ebb3c8d677bd3b378ff7bfd1764d194d56f9   30703:
 9b15742e8a3a851680ad06d1238cbbf703a2c9cb   30687:
 5b5eb0010e88d7c1fee1834052d4efba531a7b25   30655:
 ed6fed4b7b3c2ba001683e66901d42519a240696   30591:
 59f050c081d178a1dc3a41aab8c621ec8ed7a078   30463:
 cefa3af1ae482653002ca7589f72a990fd73f898   30207:
 589ad079c10345de9d684b9e90fc5c2d801c6fff   29695:
 149aa9be835531498eef25ba8c84ae31c72b5258   28671:
 73b9451df9198b02366b93eb8a57542bfb852ac0 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/acpi/acpi_memhotplug.c | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d8252e1c6e55..33ada937a83e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ac023989e6dd1b97140b47fb942a7940d0b2af2
+refs/heads/master: 1f425994f96d85540d47eee98daabc1e211b454e
diff --git a/trunk/drivers/acpi/acpi_memhotplug.c b/trunk/drivers/acpi/acpi_memhotplug.c
index 1486e03bb41a..3721f8dd0de3 100644
--- a/trunk/drivers/acpi/acpi_memhotplug.c
+++ b/trunk/drivers/acpi/acpi_memhotplug.c
@@ -57,6 +57,7 @@ MODULE_LICENSE("GPL");
 
 static int acpi_memory_device_add(struct acpi_device *device);
 static int acpi_memory_device_remove(struct acpi_device *device, int type);
+static int acpi_memory_device_start(struct acpi_device *device);
 
 static struct acpi_driver acpi_memory_device_driver = {
 	.name = ACPI_MEMORY_DEVICE_DRIVER_NAME,
@@ -65,6 +66,7 @@ static struct acpi_driver acpi_memory_device_driver = {
 	.ops = {
 		.add = acpi_memory_device_add,
 		.remove = acpi_memory_device_remove,
+		.start = acpi_memory_device_start,
 		},
 };
 
@@ -433,6 +435,25 @@ static int acpi_memory_device_remove(struct acpi_device *device, int type)
 	return_VALUE(0);
 }
 
+static int acpi_memory_device_start (struct acpi_device *device)
+{
+	struct acpi_memory_device *mem_device;
+	int result = 0;
+
+	ACPI_FUNCTION_TRACE("acpi_memory_device_start");
+
+	mem_device = acpi_driver_data(device);
+
+	if (!acpi_memory_check_device(mem_device)) {
+		/* call add_memory func */
+		result = acpi_memory_enable_device(mem_device);
+		if (result)
+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+				"Error in acpi_memory_enable_device\n"));
+	}
+	return_VALUE(result);
+}
+
 /*
  * Helper function to check for memory device
  */