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

Merge branch 'x86/urgent' into x86-mm

Browse Source 
Merge reason: Pick up the following two fix commits.

  2be19102b7: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
  765af22da8: x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change

Scheduled NUMA init 32/64bit unification changes depend on these.

Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Tejun Heo
2011-05-02 14:16:37 +02:00
parent aff364860a 2be19102b7
commit ba67cf5cf2
3115 changed files with 12719 additions and 11505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/processor_throttling.c
View File

@@ -1152,7 +1152,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr,
*/
if (!match_pr->flags.throttling) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Throttling Controll is unsupported "
"Throttling Control is unsupported "
"on CPU %d\n", i));
continue;
}