lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI: resolve merge conflict between sem2mutex and processor_perflib.c

Browse Source 
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2006-06-15 22:19:31 -04:00
parent d42510a0f5
commit 785fcccd68
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/processor_perflib.c
View File

@@ -624,7 +624,7 @@ int acpi_processor_preregister_performance(
struct acpi_processor *match_pr; struct acpi_processor *match_pr;
struct acpi_psd_package *match_pdomain; struct acpi_psd_package *match_pdomain;
down(&performance_sem); mutex_lock(&performance_mutex);
retval = 0; retval = 0;
@@ -772,7 +772,7 @@ err_ret:
pr->performance = NULL; /* Will be set for real in register */ pr->performance = NULL; /* Will be set for real in register */
} }
up(&performance_sem); mutex_unlock(&performance_mutex);
return retval; return retval;
} }
EXPORT_SYMBOL(acpi_processor_preregister_performance); EXPORT_SYMBOL(acpi_processor_preregister_performance);