diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 15:54:00 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 15:54:00 (GMT) |
| commit | 024bb9617e01716c5ac7d235f54483cc6018978f (patch) | |
| tree | 995fa77058bb980b891ca7cbe383399e1e81a8cb /arch/sparc/kernel/kernel.h | |
| parent | 25431e900dc47abb312c9ae8599e8c8ae038eb5a (diff) | |
| parent | 9b02605826903203d5301049c1f52e722584785c (diff) | |
| download | linux-fsl-qoriq-024bb9617e01716c5ac7d235f54483cc6018978f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Kill bogus TPC/address truncation during 32-bit faults.
sparc: fixup for sparseirq changes
sparc64: Validate kernel generated fault addresses on sparc64.
sparc64: On non-Niagara, need to touch NMI watchdog in NOHZ mode.
sparc64: Implement NMI watchdog on capable cpus.
sparc: Probe PMU type and record in sparc_pmu_type.
sparc64: Move generic PCR support code to seperate file.
Diffstat (limited to 'arch/sparc/kernel/kernel.h')
| -rw-r--r-- | arch/sparc/kernel/kernel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h index 81a972e..15d8a3f 100644 --- a/arch/sparc/kernel/kernel.h +++ b/arch/sparc/kernel/kernel.h @@ -5,6 +5,7 @@ /* 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; |