diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-17 17:51:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-17 17:51:27 -0800 |
| commit | a0aeccdc694d5db3b4310a6ed1ce4f88974cf7b4 (patch) | |
| tree | 2a4e8f8a2641eccd96d5d2aa58d9cf5aa6546c4c /arch/sparc/kernel/pcr.c | |
| parent | fa7ea87a057958a8b7926c1a60a3ca6d696328ed (diff) | |
| parent | b62818e5ff78cab4daf04fc0c12f86475dbc4b69 (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 NMI startup bug which also breaks perf.
sparc: fix size argument to find_next_zero_bit()
sparc: use bitmap_set()
sparc32: unaligned memory access (MNA) trap handler bug
Diffstat (limited to 'arch/sparc/kernel/pcr.c')
| -rw-r--r-- | arch/sparc/kernel/pcr.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c index ae96cf52a955..7c2ced612b8f 100644 --- a/arch/sparc/kernel/pcr.c +++ b/arch/sparc/kernel/pcr.c @@ -167,5 +167,3 @@ out_unregister: unregister_perf_hsvc(); return err; } - -early_initcall(pcr_arch_init); |