Commit 2d4a73d5 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Kill off special boot_cpu_data. 



This consolidates the cpu_data definitions and gets rid of the special
boot_cpu_data. It's made a wrapper to the boot CPU, in order to keep
the existing in-tree users happy.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 00765c81

arch/sh/kernel/setup.c

+7 −1
Original line number Diff line number Diff line
@@ -42,7 +42,13 @@ extern void * __rd_start, * __rd_end; 
 * This value will be used at the very early stage of serial setup.

 * The bigger value means no problem.

 */

struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 10000000, };

struct sh_cpuinfo cpu_data[NR_CPUS] __read_mostly = {

	[0] = {

		.type			= CPU_SH_NONE,

		.loops_per_jiffy	= 10000000,

	},

};

EXPORT_SYMBOL(cpu_data);



/*

 * The machine vector. First entry in .machvec.init, or clobbered by

arch/sh/kernel/sh_ksyms.c

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ EXPORT_SYMBOL(memcpy); 
EXPORT_SYMBOL(memset);

EXPORT_SYMBOL(memmove);

EXPORT_SYMBOL(__copy_user);

EXPORT_SYMBOL(boot_cpu_data);



#ifdef CONFIG_MMU

EXPORT_SYMBOL(get_vm_area);

include/asm-sh/processor.h

+2 −7
Original line number Diff line number Diff line
@@ -73,15 +73,10 @@ struct sh_cpuinfo { 
	unsigned long flags;

} __attribute__ ((aligned(SMP_CACHE_BYTES)));



extern struct sh_cpuinfo boot_cpu_data;



#ifdef CONFIG_SMP

extern struct sh_cpuinfo cpu_data[];

#define boot_cpu_data cpu_data[0]

#define current_cpu_data cpu_data[smp_processor_id()]

#else

#define cpu_data (&boot_cpu_data)

#define current_cpu_data boot_cpu_data

#endif

#define raw_current_cpu_data cpu_data[raw_smp_processor_id()]



/*

 * User space process size: 2GB.