diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-03 08:08:49 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-03 08:08:49 -0800 |
| commit | c7d5a0050773e98d1094eaa9f2a1a793fafac300 (patch) | |
| tree | 9836ff13aabf0990d5f235f24c90b5ef5cd8ae71 /arch/sparc/kernel/syscalls.S | |
| parent | 6c5ae5b278e29c1a23fd562e1a5276c2e2ea1738 (diff) | |
| download | talos-obmc-linux-c7d5a0050773e98d1094eaa9f2a1a793fafac300.tar.gz talos-obmc-linux-c7d5a0050773e98d1094eaa9f2a1a793fafac300.zip | |
sparc64: Kill off old sys_perfctr system call and state.
People should be using the perf events interfaces, and
the way these system call facilities used the %pcr conflicts
with the usage of the NMI watchdog and perf events.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/syscalls.S')
| -rw-r--r-- | arch/sparc/kernel/syscalls.S | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S index dc4a458f74dc..1d7e274f3f2b 100644 --- a/arch/sparc/kernel/syscalls.S +++ b/arch/sparc/kernel/syscalls.S @@ -110,31 +110,12 @@ sys_clone: .globl ret_from_syscall ret_from_syscall: - /* Clear current_thread_info()->new_child, and - * check performance counter stuff too. - */ + /* Clear current_thread_info()->new_child. */ stb %g0, [%g6 + TI_NEW_CHILD] ldx [%g6 + TI_FLAGS], %l0 call schedule_tail mov %g7, %o0 - andcc %l0, _TIF_PERFCTR, %g0 - be,pt %icc, 1f - nop - ldx [%g6 + TI_PCR], %o7 - wr %g0, %o7, %pcr - - /* Blackbird errata workaround. See commentary in - * smp.c:smp_percpu_timer_interrupt() for more - * information. - */ - ba,pt %xcc, 99f - nop - - .align 64 -99: wr %g0, %g0, %pic - rd %pic, %g0 - -1: ba,pt %xcc, ret_sys_call + ba,pt %xcc, ret_sys_call ldx [%sp + PTREGS_OFF + PT_V9_I0], %o0 .globl sparc_exit |
