Parcourir la source

[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>
Andrew Morton il y a 18 ans
Parent
commit
1fec74a9cd
1 fichiers modifiés avec 6 ajouts et 0 suppressions
  1. 6 0
      drivers/acpi/processor_idle.c

+ 6 - 0
drivers/acpi/processor_idle.c

@@ -1108,6 +1108,7 @@ static const struct file_operations acpi_processor_power_fops = {
 	.release = single_release,
 	.release = single_release,
 };
 };
 
 
+#ifdef CONFIG_SMP
 static void smp_callback(void *v)
 static void smp_callback(void *v)
 {
 {
 	/* we already woke the CPU up, nothing more to do */
 	/* we already woke the CPU up, nothing more to do */
@@ -1129,6 +1130,7 @@ static int acpi_processor_latency_notify(struct notifier_block *b,
 static struct notifier_block acpi_processor_latency_notifier = {
 static struct notifier_block acpi_processor_latency_notifier = {
 	.notifier_call = acpi_processor_latency_notify,
 	.notifier_call = acpi_processor_latency_notify,
 };
 };
+#endif
 
 
 int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
 int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
 			      struct acpi_device *device)
 			      struct acpi_device *device)
@@ -1146,7 +1148,9 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
 			       "ACPI: processor limited to max C-state %d\n",
 			       "ACPI: processor limited to max C-state %d\n",
 			       max_cstate);
 			       max_cstate);
 		first_run++;
 		first_run++;
+#ifdef CONFIG_SMP
 		register_latency_notifier(&acpi_processor_latency_notifier);
 		register_latency_notifier(&acpi_processor_latency_notifier);
+#endif
 	}
 	}
 
 
 	if (!pr)
 	if (!pr)
@@ -1218,7 +1222,9 @@ int acpi_processor_power_exit(struct acpi_processor *pr,
 		 * copies of pm_idle before proceeding.
 		 * copies of pm_idle before proceeding.
 		 */
 		 */
 		cpu_idle_wait();
 		cpu_idle_wait();
+#ifdef CONFIG_SMP
 		unregister_latency_notifier(&acpi_processor_latency_notifier);
 		unregister_latency_notifier(&acpi_processor_latency_notifier);
+#endif
 	}
 	}
 
 
 	return 0;
 	return 0;