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

Commit 60dead5a authored by Jesper Nilsson's avatar Jesper Nilsson
Browse files

CRIS: Register cpus in kernel/setup.c 

Also, fix some white space errors, and constify cpuinfo_op.
parent 3ae8d8ba

arch/cris/kernel/setup.c

+21 −8
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/screen_info.h>

#include <linux/utsname.h>

#include <linux/pfn.h>



#include <linux/cpu.h>

#include <asm/setup.h>



/*
@@ -36,6 +36,8 @@ extern unsigned long dram_start, dram_end; 


extern unsigned long romfs_start, romfs_length, romfs_in_flash; /* from head.S */



static struct cpu cpu_devices[NR_CPUS];



extern void show_etrax_copyright(void);		/* arch-vX/kernel/setup.c */



/* This mainly sets up the memory area, and can be really confusing.
@@ -54,8 +56,7 @@ extern void show_etrax_copyright(void); /* arch-vX/kernel/setup.c */ 
 *

 */



void __init 

setup_arch(char **cmdline_p)

void __init setup_arch(char **cmdline_p)

{

	extern void init_etrax_debug(void);

	unsigned long bootmap_size;
@@ -180,11 +181,23 @@ static void c_stop(struct seq_file *m, void *v) 


extern int show_cpuinfo(struct seq_file *m, void *v);



struct seq_operations cpuinfo_op = {

const struct seq_operations cpuinfo_op = {

	.start = c_start,

	.next  = c_next,

	.stop  = c_stop,

	.show  = show_cpuinfo,

};



static int __init topology_init(void)

{

	int i;



	for_each_possible_cpu(i) {

		 return register_cpu(&cpu_devices[i], i);

	}



	return 0;

}



subsys_initcall(topology_init);