diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-10 11:48:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-10 11:48:49 -0800 |
| commit | 226b79104f625f3f58a8388b8b32a4b90415bf02 (patch) | |
| tree | 408a91f47b33fd59711a75cebbcb69a22b9fe7cd /arch/sparc/kernel/pcr.c | |
| parent | 29ef01179d37168a021293ede77afbf091a49af4 (diff) | |
| parent | aeb398768345c74a9e4c01aa3ebf839e858312ec (diff) | |
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: Fix probe_kernel_{read,write}().
sparc64: Kill .fixup section bloat.
sparc64: Don't hook up pcr_ops on spitfire chips.
sparc64: Call dump_stack() in die_nmi().
Diffstat (limited to 'arch/sparc/kernel/pcr.c')
| -rw-r--r-- | arch/sparc/kernel/pcr.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c index 92e0dda141a..1ae8cdd7e70 100644 --- a/arch/sparc/kernel/pcr.c +++ b/arch/sparc/kernel/pcr.c @@ -133,11 +133,16 @@ int __init pcr_arch_init(void) case cheetah: case cheetah_plus: - case spitfire: pcr_ops = &direct_pcr_ops; pcr_enable = PCR_SUN4U_ENABLE; break; + case spitfire: + /* UltraSPARC-I/II and derivatives lack a profile + * counter overflow interrupt so we can't make use of + * their hardware currently. + */ + /* fallthrough */ default: err = -ENODEV; goto out_unregister; |