diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 12:09:53 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 12:09:53 -0400 |
| commit | 044c31fdf80ed9d8e6bfb33913d085c3efc6febe (patch) | |
| tree | 9252cd09defdd29742af6b2bd22db72ce252ab1a /arch/sparc/kernel/kernel.h | |
| parent | af7a950284af5526a26b4ae4809c1104b4dc47f3 (diff) | |
| parent | c5624f554600ab812fe235690665ee81413cebc3 (diff) | |
Merge commit 'v3.0.2' into linaro-3.0
Diffstat (limited to 'arch/sparc/kernel/kernel.h')
| -rw-r--r-- | arch/sparc/kernel/kernel.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h index 6f6544cfa0e..fd6c36b1df7 100644 --- a/arch/sparc/kernel/kernel.h +++ b/arch/sparc/kernel/kernel.h @@ -4,12 +4,27 @@ #include <linux/interrupt.h> #include <asm/traps.h> +#include <asm/head.h> +#include <asm/io.h> /* cpu.c */ extern const char *sparc_pmu_type; extern unsigned int fsr_storage; extern int ncpus_probed; +#ifdef CONFIG_SPARC64 +/* setup_64.c */ +struct seq_file; +extern void cpucap_info(struct seq_file *); + +static inline unsigned long kimage_addr_to_ra(const char *p) +{ + unsigned long val = (unsigned long) p; + + return kern_base + (val - KERNBASE); +} +#endif + #ifdef CONFIG_SPARC32 /* cpu.c */ extern void cpu_probe(void); |