apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'linus' into release

Browse Source 
Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2009-04-05 02:14:15 -04:00
parent 8a3f257c70 6bb597507f
commit 478c6a43fc
6737 changed files with 522841 additions and 237857 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/acpi/processor_perflib.c
+2 -2
View File
@@ -524,7 +524,7 @@ int acpi_processor_preregister_performance(
goto err_out;
}
if (!performance || !percpu_ptr(performance, i)) {
if (!performance || !per_cpu_ptr(performance, i)) {
retval = -EINVAL;
goto err_out;
}
@@ -536,7 +536,7 @@ int acpi_processor_preregister_performance(
if (!pr)
continue;
pr->performance = percpu_ptr(performance, i);
pr->performance = per_cpu_ptr(performance, i);
cpumask_set_cpu(i, pr->performance->shared_cpu_map);
if (acpi_processor_get_psd(pr)) {
retval = -EINVAL;