diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 22:19:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 22:19:31 -0400 |
| commit | 785fcccd68bd4dc436f75fd4cd40e8557966c86d (patch) | |
| tree | 92fbac7035de7751a9db89c4761e4bdbac346749 /drivers/acpi/processor_perflib.c | |
| parent | d42510a0f58c2583c37c8e9b7548e3a68545863a (diff) | |
| download | kernel_samsung_smdk4412-785fcccd68bd4dc436f75fd4cd40e8557966c86d.tar.gz kernel_samsung_smdk4412-785fcccd68bd4dc436f75fd4cd40e8557966c86d.tar.bz2 kernel_samsung_smdk4412-785fcccd68bd4dc436f75fd4cd40e8557966c86d.zip | |
ACPI: resolve merge conflict between sem2mutex and processor_perflib.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/processor_perflib.c')
| -rw-r--r-- | drivers/acpi/processor_perflib.c | 4 |
1 files 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); |