diff options
| author | Michal Simek <monstr@monstr.eu> | 2012-01-30 10:53:08 +0100 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2012-01-31 09:06:52 +0100 |
| commit | 9afc416517f36b3b0b109e6590d0b74468fd80f9 (patch) | |
| tree | df65a511f1b488cf742f4649b388ddf6afa3412f | |
| parent | 27ba234c8dfe86c96675d4ef275d1d3c1f5f7053 (diff) | |
| download | linux-9afc416517f36b3b0b109e6590d0b74468fd80f9.tar.gz linux-9afc416517f36b3b0b109e6590d0b74468fd80f9.tar.bz2 linux-9afc416517f36b3b0b109e6590d0b74468fd80f9.zip | |
Revert "microblaze: Add topology init"
This reverts commit d761f0c521868e59cd0bc59159cbdb4686fe210d.
Patch: "cpu: Register a generic CPU device on architectures that currently do not"
(sha1: 9f13a1fd452f11c18004ba2422a6384b424ec8a9)
selects GENERIC_CPU_DEVICES for Microblaze which register cpu.
My patch was done in the same time that's why cpu was registered twice which
caused this warning log:
------------[ cut here ]------------
WARNING: at fs/sysfs/dir.c:481 sysfs_add_one+0xb0/0xdc()
sysfs: cannot create duplicate filename '/devices/system/cpu/cpu0'
Modules linked in:
...
Signed-off-by: Michal Simek <monstr@monstr.eu>
| -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); |