From 13402c04bbe03ef5c40f28345d3bda7b1bb45f3e Mon Sep 17 00:00:00 2001 From: Wen Congyang Date: Thu, 15 Nov 2012 00:22:27 +0100 Subject: [PATCH] --- yaml --- r: 336681 b: refs/heads/master c: 54c4c7db6cb94d7d1217df6d7fca6847c61744ab h: refs/heads/master i: 336679: 3321aa952e0a334cddd2a7050c1a19cc5e7034c9 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpi_memhotplug.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 87d5bb73fdbd..dc5baea0acdd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: acacb5f211e99fa2c98cf4ef4c632ab43724adb6 +refs/heads/master: 54c4c7db6cb94d7d1217df6d7fca6847c61744ab diff --git a/trunk/drivers/acpi/acpi_memhotplug.c b/trunk/drivers/acpi/acpi_memhotplug.c index 24c807f96636..1e90e8f01007 100644 --- a/trunk/drivers/acpi/acpi_memhotplug.c +++ b/trunk/drivers/acpi/acpi_memhotplug.c @@ -401,8 +401,9 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data) } /* - * TBD: Invoke acpi_bus_remove to cleanup data structures + * Invoke acpi_bus_trim() to remove memory device */ + acpi_bus_trim(device, 1); /* _EJ0 succeeded; _OST is not necessary */ return;