Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9afc4165 authored by Michal Simek's avatar Michal Simek
Browse files

Revert "microblaze: Add topology init" 



This reverts commit d761f0c5.

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

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: default avatarMichal Simek <monstr@monstr.eu>
parent 27ba234c

arch/microblaze/kernel/setup.c

+1 −20
Original line number Diff line number Diff line
@@ -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);