aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/processor_idle.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-10-17 03:09:58 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-17 11:18:44 -0400
commit1fec74a9cda95772887c82ede5c0ac60f5be857e (patch)
treec3d0cc4270d37bff046668a0f437950c0788939c /drivers/acpi/processor_idle.c
parent286e1ea3ac1ca4f503ebbb3020bdb0cbe6adffac (diff)
[PATCH] acpi_processor_latency_notifier(): UP warning fix
drivers/acpi/processor_idle.c:1112: warning: 'smp_callback' defined but not used Cc: Len Brown <lenb@kernel.org> Cc: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/acpi/processor_idle.c')
-rw-r--r--drivers/acpi/processor_idle.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 526387dc3799..e67144cf3c8b 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1108,6 +1108,7 @@ static const struct file_operations acpi_processor_power_fops = {
1108 .release = single_release, 1108 .release = single_release,
1109}; 1109};
1110 1110
1111#ifdef CONFIG_SMP
1111static void smp_callback(void *v) 1112static void smp_callback(void *v)
1112{ 1113{
1113 /* we already woke the CPU up, nothing more to do */ 1114 /* we already woke the CPU up, nothing more to do */
@@ -1129,6 +1130,7 @@ static int acpi_processor_latency_notify(struct notifier_block *b,
1129static struct notifier_block acpi_processor_latency_notifier = { 1130static struct notifier_block acpi_processor_latency_notifier = {
1130 .notifier_call = acpi_processor_latency_notify, 1131 .notifier_call = acpi_processor_latency_notify,
1131}; 1132};
1133#endif
1132 1134
1133int __cpuinit acpi_processor_power_init(struct acpi_processor *pr, 1135int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
1134 struct acpi_device *device) 1136 struct acpi_device *device)
@@ -1146,7 +1148,9 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
1146 "ACPI: processor limited to max C-state %d\n", 1148 "ACPI: processor limited to max C-state %d\n",
1147 max_cstate); 1149 max_cstate);
1148 first_run++; 1150 first_run++;
1151#ifdef CONFIG_SMP
1149 register_latency_notifier(&acpi_processor_latency_notifier); 1152 register_latency_notifier(&acpi_processor_latency_notifier);
1153#endif
1150 } 1154 }
1151 1155
1152 if (!pr) 1156 if (!pr)
@@ -1218,7 +1222,9 @@ int acpi_processor_power_exit(struct acpi_processor *pr,
1218 * copies of pm_idle before proceeding. 1222 * copies of pm_idle before proceeding.
1219 */ 1223 */
1220 cpu_idle_wait(); 1224 cpu_idle_wait();
1225#ifdef CONFIG_SMP
1221 unregister_latency_notifier(&acpi_processor_latency_notifier); 1226 unregister_latency_notifier(&acpi_processor_latency_notifier);
1227#endif
1222 } 1228 }
1223 1229
1224 return 0; 1230 return 0;