Merge branch 'acpi-pad' into release

[net-next-2.6.git] / drivers / acpi / acpi_pad.c

diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index a7bd49f0f01f367547493bf4e91af8f0ad8bca44..7e52295f1ecc020d65582eb9d1c867126673a1d6 100644 (file)
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -100,7 +100,8 @@ static void round_robin_cpu(unsigned int tsk_index)
        struct cpumask *pad_busy_cpus = to_cpumask(pad_busy_cpus_bits);
        cpumask_var_t tmp;
        int cpu;
-       unsigned long min_weight = -1, preferred_cpu;
+       unsigned long min_weight = -1;
+       unsigned long uninitialized_var(preferred_cpu);
 
        if (!alloc_cpumask_var(&tmp, GFP_KERNEL))
                return;