Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 785fcccd authored by Len Brown's avatar Len Brown
Browse files

ACPI: resolve merge conflict between sem2mutex and processor_perflib.c 



Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent d42510a0

drivers/acpi/processor_perflib.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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 @@ int acpi_processor_preregister_performance( 
		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);