From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Jul 2008 20:00:54 +0000 (+0200)
Subject: Merge branch 'linus' into cpus4096
X-Git-Tag: v2.6.27-rc1~848^2~18
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bb2c018b09b681d43f5e08124b83e362647ea82b;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into cpus4096

Conflicts:

	drivers/acpi/processor_throttling.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

bb2c018b09b681d43f5e08124b83e362647ea82b
diff --cc drivers/acpi/processor_throttling.c
index 28509fbba6f,0622ace0522..a56fc6c4394
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@@ -1034,8 -1034,8 +1034,8 @@@ int acpi_processor_set_throttling(struc
  		 * it is necessary to set T-state for every affected
  		 * cpus.
  		 */
 -		for_each_cpu_mask(i, online_throttling_cpus) {
 +		for_each_cpu_mask_nr(i, online_throttling_cpus) {
- 			match_pr = processors[i];
+ 			match_pr = per_cpu(processors, i);
  			/*
  			 * If the pointer is invalid, we will report the
  			 * error message and continue.