diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-02 20:18:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-02 20:18:18 +0100 |
| commit | c84e295b304f7359ee89645d099d79d3a4648c0b (patch) | |
| tree | f446c55611dd906c012db8ba5fb9e8b2e031316d /arch | |
| parent | Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus', 'sched-urgen... (diff) | |
| parent | Revert "microblaze: Add topology init" (diff) | |
| download | linux-c84e295b304f7359ee89645d099d79d3a4648c0b.tar.xz linux-c84e295b304f7359ee89645d099d79d3a4648c0b.zip | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
Revert "microblaze: Add topology init"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/microblaze/kernel/setup.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index d4fc1a971779..604cd9dd1333 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -26,7 +26,6 @@ #include <linux/cache.h> #include <linux/of_platform.h> #include <linux/dma-mapping.h> -#include <linux/cpu.h> #include <asm/cacheflush.h> #include <asm/entry.h> #include <asm/cpuinfo.h> @@ -227,23 +226,5 @@ static int __init setup_bus_notifier(void) return 0; } -arch_initcall(setup_bus_notifier); - -static DEFINE_PER_CPU(struct cpu, cpu_devices); - -static int __init topology_init(void) -{ - int i, ret; - - for_each_present_cpu(i) { - struct cpu *c = &per_cpu(cpu_devices, i); - ret = register_cpu(c, i); - if (ret) - printk(KERN_WARNING "topology_init: register_cpu %d " - "failed (%d)\n", i, ret); - } - - return 0; -} -subsys_initcall(topology_init); +arch_initcall(setup_bus_notifier); |