1 files changed, 23 insertions, 0 deletions

diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index 919624f123d5..0f0c64bf8ac9 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -676,6 +676,7 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
 {
         u16 reference_count;
         union acpi_operand_object *next_object;
+        acpi_status status;
 
         /* Save fields from destination that we don't want to overwrite */
 
@@ -768,6 +769,28 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
                 }
                 break;
 
+                /*
+                 * For Mutex and Event objects, we cannot simply copy the underlying
+                 * OS object. We must create a new one.
+                 */
+        case ACPI_TYPE_MUTEX:
+
+                status = acpi_os_create_mutex(&dest_desc->mutex.os_mutex);
+                if (ACPI_FAILURE(status)) {
+                        return status;
+                }
+                break;
+
+        case ACPI_TYPE_EVENT:
+
+                status = acpi_os_create_semaphore(ACPI_NO_UNIT_LIMIT, 0,
+                                                  &dest_desc->event.
+                                                  os_semaphore);
+                if (ACPI_FAILURE(status)) {
+                        return status;
+                }
+                break;
+
         default:
                 /* Nothing to do for other simple objects */
                 break;