diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 11:24:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 11:24:47 -0500 |
| commit | 6895210e89df20520916c94a4dc148a43229053e (patch) | |
| tree | 60b137cccd4a57bb98bbfed55a42859e4b60c8db /arch/sparc/kernel/systbls.h | |
| parent | 4c10c937cc2eb197db565392db91d429eec71176 (diff) | |
| parent | 8a4fd1e4922413cfdfa6c51a59efb720d904a5eb (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: Make prom entry spinlock NMI safe.
sparc64: Kill off old sys_perfctr system call and state.
sparc: Update defconfigs.
sparc: Provide io{read,write}{16,32}be().
Diffstat (limited to 'arch/sparc/kernel/systbls.h')
| -rw-r--r-- | arch/sparc/kernel/systbls.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/systbls.h b/arch/sparc/kernel/systbls.h index d2f999ae2b85..68312fe8da74 100644 --- a/arch/sparc/kernel/systbls.h +++ b/arch/sparc/kernel/systbls.h | |||
| @@ -36,8 +36,6 @@ extern asmlinkage long sys_rt_sigaction(int sig, | |||
| 36 | struct sigaction __user *oact, | 36 | struct sigaction __user *oact, |
| 37 | void __user *restorer, | 37 | void __user *restorer, |
| 38 | size_t sigsetsize); | 38 | size_t sigsetsize); |
| 39 | extern asmlinkage long sys_perfctr(int opcode, unsigned long arg0, | ||
| 40 | unsigned long arg1, unsigned long arg2); | ||
| 41 | 39 | ||
| 42 | extern asmlinkage void sparc64_set_context(struct pt_regs *regs); | 40 | extern asmlinkage void sparc64_set_context(struct pt_regs *regs); |
| 43 | extern asmlinkage void sparc64_get_context(struct pt_regs *regs); | 41 | extern asmlinkage void sparc64_get_context(struct pt_regs *regs); |