mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
ACPI: resolve merge conflict between sem2mutex and processor_perflib.c
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
d42510a0f5
commit
785fcccd68
1 changed files with 2 additions and 2 deletions
|
@ -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 @@ int acpi_processor_preregister_performance(
|
|||
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);
|
||||
|
|
Loading…
Reference in a new issue