diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-13 10:52:12 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-13 10:52:12 +1000 |
commit | d44fd90b6abe5725f7cc71cca78e8bb695eacd91 (patch) | |
tree | 3e4e8d2b38dec018556b875d938c061ca938ebe7 /arch/sparc/kernel/kernel.h | |
parent | 693a35ec6fb688f293a647e665fe4d8472dfeb27 (diff) | |
parent | 970def654e9df1ad28ddb466bb1d123a55e1e7e7 (diff) |
Merge remote-tracking branch 'sparc/master'
Diffstat (limited to 'arch/sparc/kernel/kernel.h')
-rw-r--r-- | arch/sparc/kernel/kernel.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h index 24ad449886be..6f6544cfa0ef 100644 --- a/arch/sparc/kernel/kernel.h +++ b/arch/sparc/kernel/kernel.h @@ -6,11 +6,9 @@ #include <asm/traps.h> /* cpu.c */ -extern const char *sparc_cpu_type; extern const char *sparc_pmu_type; -extern const char *sparc_fpu_type; - extern unsigned int fsr_storage; +extern int ncpus_probed; #ifdef CONFIG_SPARC32 /* cpu.c */ @@ -37,6 +35,7 @@ extern void sun4c_init_IRQ(void); extern unsigned int lvl14_resolution; extern void sun4m_init_IRQ(void); +extern void sun4m_unmask_profile_irq(void); extern void sun4m_clear_profile_irq(int cpu); /* sun4d_irq.c */ |