Skip to content

L
linux
Commit bd15d114 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge http://linux-scsi.bkbits.net/scsi-for-linus-2.5 

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 35766eb7 26d987a7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
drivers/acpi/processor.c
View file @ bd15d114
...@@ -1040,6 +1040,7 @@ acpi_processor_apply_limit ( ...@@ -1040,6 +1040,7 @@ acpi_processor_apply_limit (
if (!pr->flags.limit) if (!pr->flags.limit)
return_VALUE(-ENODEV); return_VALUE(-ENODEV);
#ifdef CONFIG_CPU_FREQ
if (pr->flags.performance) { if (pr->flags.performance) {
px = pr->performance_platform_limit; px = pr->performance_platform_limit;
if (pr->limit.user.px > px) if (pr->limit.user.px > px)
...@@ -1058,6 +1059,7 @@ acpi_processor_apply_limit ( ...@@ -1058,6 +1059,7 @@ acpi_processor_apply_limit (
} else if (pr->performance_platform_limit) { } else if (pr->performance_platform_limit) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Platform limit event detected. Consider using ACPI P-States CPUfreq driver\n")); ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Platform limit event detected. Consider using ACPI P-States CPUfreq driver\n"));
} }
#endif
if (pr->flags.throttling) { if (pr->flags.throttling) {
if (pr->limit.user.tx > tx) if (pr->limit.user.tx > tx)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7