diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2012-05-25 21:20:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-27 23:52:42 -0700 |
| commit | 4efb55e6916628fde549b0ef1c2830593ccf19c4 (patch) | |
| tree | c8d2ac063efb6b591f6f1dda08ecffe9db97efa6 /arch | |
| parent | 30005efc9818d715cc72f15e962d06457c529783 (diff) | |
| download | linux-stable-4efb55e6916628fde549b0ef1c2830593ccf19c4.tar.gz linux-stable-4efb55e6916628fde549b0ef1c2830593ccf19c4.tar.bz2 linux-stable-4efb55e6916628fde549b0ef1c2830593ccf19c4.zip | |
sparc32: introduce sparc32_start_kernel called from head_32.S
This gives us a C hook before we call start_kernel()
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/head_32.S | 10 | ||||
| -rw-r--r-- | arch/sparc/kernel/kernel.h | 3 | ||||
| -rw-r--r-- | arch/sparc/kernel/setup_32.c | 10 |
3 files changed, 15 insertions, 8 deletions
diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S index f22a729dfb3d..6c6b8c27c1b8 100644 --- a/arch/sparc/kernel/head_32.S +++ b/arch/sparc/kernel/head_32.S @@ -661,16 +661,10 @@ continue_boot: wr %g3, PSR_ET, %psr WRITE_PAUSE - /* First we call prom_init() to set up PROMLIB, then - * off to start_kernel(). - */ - + /* Call sparc32_start_kernel(struct linux_romvec *rp) */ sethi %hi(prom_vector_p), %g5 ld [%g5 + %lo(prom_vector_p)], %o0 - call prom_init - nop - - call start_kernel + call sparc32_start_kernel nop /* We should not get here. */ diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h index a86372d34587..291bb5de9ce0 100644 --- a/arch/sparc/kernel/kernel.h +++ b/arch/sparc/kernel/kernel.h @@ -26,6 +26,9 @@ static inline unsigned long kimage_addr_to_ra(const char *p) #endif #ifdef CONFIG_SPARC32 +/* setup_32.c */ +void sparc32_start_kernel(struct linux_romvec *rp); + /* cpu.c */ extern void cpu_probe(void); diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index c052313f4dc5..68dd63dea36f 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -32,6 +32,7 @@ #include <linux/cpu.h> #include <linux/kdebug.h> #include <linux/export.h> +#include <linux/start_kernel.h> #include <asm/io.h> #include <asm/processor.h> @@ -244,6 +245,15 @@ struct tt_entry *sparc_ttable; struct pt_regs fake_swapper_regs; +/* Called from head_32.S - before we have setup anything + * in the kernel. Be very careful with what you do here. + */ +void __init sparc32_start_kernel(struct linux_romvec *rp) +{ + prom_init(rp); + start_kernel(); +} + void __init setup_arch(char **cmdline_p) { int i; |