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

Commit a9079ca0 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Tidy CPU probing and fixup section annotations. 



This does a detect_cpu_and_cache_system() -> cpu_probe() rename, tidies
up the unused return value, and stuffs it under __cpuinit in preparation
for CPU hotplug.

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

arch/sh/include/asm/cache.h

+0 −4
Original line number Diff line number Diff line
@@ -38,14 +38,10 @@ struct cache_info { 
	 * 2. those in the physical page number.

	 */

	unsigned int alias_mask;



	unsigned int n_aliases;		/* Number of aliases */



	unsigned long flags;

};



int __init detect_cpu_and_cache_system(void);



#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */

#endif /* __ASM_SH_CACHE_H */

arch/sh/include/asm/processor.h

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ struct task_struct; 


extern struct pt_regs fake_swapper_regs;



extern void cpu_probe(void);



/* arch/sh/kernel/process.c */

extern unsigned int xstate_size;

extern void free_thread_xstate(struct task_struct *);

arch/sh/kernel/cpu/init.c

+2 −2
Original line number Diff line number Diff line
@@ -293,14 +293,14 @@ static inline void __init dsp_init(void) { } 
 * subtype and initial configuration will all be done.

 *

 * Each processor family is still responsible for doing its own probing

 * and cache configuration in detect_cpu_and_cache_system().

 * and cache configuration in cpu_probe().

 */

asmlinkage void __init sh_cpu_init(void)

{

	current_thread_info()->cpu = hard_smp_processor_id();



	/* First, probe the CPU */

	detect_cpu_and_cache_system();

	cpu_probe();



	if (current_cpu_data.type == CPU_SH_NONE)

		panic("Unknown CPU");

arch/sh/kernel/cpu/sh2/probe.c

+1 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <asm/processor.h>

#include <asm/cache.h>



int __init detect_cpu_and_cache_system(void)

void __cpuinit cpu_probe(void)

{

#if defined(CONFIG_CPU_SUBTYPE_SH7619)

	boot_cpu_data.type			= CPU_SH7619;
@@ -30,7 +30,4 @@ int __init detect_cpu_and_cache_system(void) 
	boot_cpu_data.dcache.flags |= SH_CACHE_COMBINED;

	boot_cpu_data.icache = boot_cpu_data.dcache;

	boot_cpu_data.family = CPU_FAMILY_SH2;



	return 0;

}

arch/sh/kernel/cpu/sh2a/probe.c

+1 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <asm/processor.h>

#include <asm/cache.h>



int __init detect_cpu_and_cache_system(void)

void __cpuinit cpu_probe(void)

{

	boot_cpu_data.family			= CPU_FAMILY_SH2A;
@@ -51,6 +51,4 @@ int __init detect_cpu_and_cache_system(void) 
	 * on the cache info.

	 */

	boot_cpu_data.icache		= boot_cpu_data.dcache;



	return 0;

}