Skip to content

Commit

Permalink
Revert "microblaze: Add topology init"
Browse files Browse the repository at this point in the history
This reverts commit d761f0c.

Patch: "cpu: Register a generic CPU device on architectures that currently do not"
(sha1: 9f13a1f)

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>
  • Loading branch information
Michal Simek committed Jan 31, 2012
1 parent 27ba234 commit 9afc416
Showing 1 changed file with 1 addition and 20 deletions.
21 changes: 1 addition & 20 deletions arch/microblaze/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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);

0 comments on commit 9afc416

Please sign in to comment.