From 785fcccd68bd4dc436f75fd4cd40e8557966c86d Mon Sep 17 00:00:00 2001 From: Len Brown Date: Thu, 15 Jun 2006 22:19:31 -0400 Subject: [PATCH] ACPI: resolve merge conflict between sem2mutex and processor_perflib.c Signed-off-by: Len Brown --- drivers/acpi/processor_perflib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index f02c5ea9084..41aaaba74b1 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c @@ -624,7 +624,7 @@ int acpi_processor_preregister_performance( struct acpi_processor *match_pr; struct acpi_psd_package *match_pdomain; - down(&performance_sem); + mutex_lock(&performance_mutex); retval = 0; @@ -772,7 +772,7 @@ err_ret: pr->performance = NULL; /* Will be set for real in register */ } - up(&performance_sem); + mutex_unlock(&performance_mutex); return retval; } EXPORT_SYMBOL(acpi_processor_preregister_performance); -- 2.11.4.GIT