- Updated to 3.3-rc4.
authorJeff Mahoney <jeffm@suse.com>
Sun, 19 Feb 2012 17:00:16 +0000 (12:00 -0500)
committerJeff Mahoney <jeffm@suse.com>
Sun, 19 Feb 2012 17:00:16 +0000 (12:00 -0500)
suse-commit: 8831dca9fae1c3f016cf5b2e925529d56dc16661

1  2 
Makefile
drivers/base/cpu.c
drivers/macintosh/adb.c
drivers/misc/Kconfig
drivers/tty/serial/8250/8250.c
include/linux/blkdev.h
scripts/mod/file2alias.c

diff --cc Makefile
Simple merge
@@@ -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
Simple merge