On Tue, Oct 23, 2007 at 06:36:33PM -0400, Jeff Garzik wrote: > Fix !CONFIG_SMP warning: > > arch/x86/kernel/acpi/processor.c: In function ‘arch_acpi_processor_init_pdc’: > arch/x86/kernel/acpi/processor.c:65: warning: unused variable ‘cpu’ > > Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]> > --- > Ideally this warning should be hidden inside a wrapper or somesuch, to > camouflage the unneeded argument in !SMP case. > > diff --git a/arch/x86/kernel/acpi/processor.c > b/arch/x86/kernel/acpi/processor.c > index 2ed0a4c..45e262a 100644 > --- a/arch/x86/kernel/acpi/processor.c > +++ b/arch/x86/kernel/acpi/processor.c > @@ -62,7 +62,9 @@ static void init_intel_pdc(struct acpi_processor *pr, > struct cpuinfo_x86 *c) > /* Initialize _PDC data based on the CPU vendor */ > void arch_acpi_processor_init_pdc(struct acpi_processor *pr) > { > +#ifdef CONFIG_SMP > unsigned int cpu = pr->id; > +#endif >...
The #ifdef is ugly. What about the patch below instead? cu Adrian <-- snip --> This patch fixes the following warning with CONFIG_SMP=n: <-- snip --> ... arch/x86/kernel/acpi/processor.c: In function `arch_acpi_processor_init_pdc': arch/x86/kernel/acpi/processor.c:65: warning: unused variable `cpu' ... <-- snip --> Based on a patch by Jeff Garzik. Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]> --- 96d83d412fb6530173110c872f1125ae21938a99 diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c index 2ed0a4c..f63e5ff 100644 --- a/arch/x86/kernel/acpi/processor.c +++ b/arch/x86/kernel/acpi/processor.c @@ -62,8 +62,7 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c) /* Initialize _PDC data based on the CPU vendor */ void arch_acpi_processor_init_pdc(struct acpi_processor *pr) { - unsigned int cpu = pr->id; - struct cpuinfo_x86 *c = &cpu_data(cpu); + struct cpuinfo_x86 *c = &cpu_data(pr->id); pr->pdc = NULL; if (c->x86_vendor == X86_VENDOR_INTEL) - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html