Merge 3.3-rc6 into driver-core-next
Greg Kroah-Hartman [Fri, 9 Mar 2012 20:35:53 +0000 (12:35 -0800)]
This was done to resolve a conflict in the drivers/base/cpu.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1  2 
drivers/base/cpu.c
drivers/pci/xen-pcifront.c
drivers/pcmcia/ds.c
include/linux/hyperv.h
scripts/mod/file2alias.c

@@@ -222,11 -240,10 +241,13 @@@ int __cpuinit register_cpu(struct cpu *
        int error;
  
        cpu->node_id = cpu_to_node(num);
+       memset(&cpu->dev, 0x00, sizeof(struct device));
        cpu->dev.id = num;
        cpu->dev.bus = &cpu_subsys;
+       cpu->dev.release = cpu_device_release;
 +#ifdef CONFIG_ARCH_HAS_CPU_AUTOPROBE
 +      cpu->dev.bus->uevent = arch_cpu_uevent;
 +#endif
        error = device_register(&cpu->dev);
        if (!error && cpu->hotpluggable)
                register_cpu_control(cpu);
Simple merge
Simple merge
Simple merge
Simple merge