diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-12-17 09:40:55 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-12-17 09:40:55 -0500 |
| commit | 6be7f5344b4fca35f1955aa73f0de825316a3236 (patch) | |
| tree | 25ccce9c837fbc7beef026b46852197b637be901 /arch/sparc/kernel/syscalls.S | |
| parent | df68f106436b684520212494a5ce0e3823b485da (diff) | |
| parent | 8246b5b03ef4ab6f29ad8edad859c74b124323cb (diff) | |
Merge tag 'asoc-3.8p1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.8
Nothing terribly exciting here, just small localised changes.
As well as fixes there are a couple of Cirrus changes and one devm_
change which were in prior to the merge window but got missed from the
original pull to Takashi.
Diffstat (limited to 'arch/sparc/kernel/syscalls.S')
| -rw-r--r-- | arch/sparc/kernel/syscalls.S | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S index 7f5f65d0b3fd..bf2347794e33 100644 --- a/arch/sparc/kernel/syscalls.S +++ b/arch/sparc/kernel/syscalls.S | |||
| @@ -118,10 +118,20 @@ ret_from_syscall: | |||
| 118 | ba,pt %xcc, ret_sys_call | 118 | ba,pt %xcc, ret_sys_call |
| 119 | ldx [%sp + PTREGS_OFF + PT_V9_I0], %o0 | 119 | ldx [%sp + PTREGS_OFF + PT_V9_I0], %o0 |
| 120 | 120 | ||
| 121 | .globl sparc_exit_group | ||
| 122 | .type sparc_exit_group,#function | ||
| 123 | sparc_exit_group: | ||
| 124 | sethi %hi(sys_exit_group), %g7 | ||
| 125 | ba,pt %xcc, 1f | ||
| 126 | or %g7, %lo(sys_exit_group), %g7 | ||
| 127 | .size sparc_exit_group,.-sparc_exit_group | ||
| 128 | |||
| 121 | .globl sparc_exit | 129 | .globl sparc_exit |
| 122 | .type sparc_exit,#function | 130 | .type sparc_exit,#function |
| 123 | sparc_exit: | 131 | sparc_exit: |
| 124 | rdpr %pstate, %g2 | 132 | sethi %hi(sys_exit), %g7 |
| 133 | or %g7, %lo(sys_exit), %g7 | ||
| 134 | 1: rdpr %pstate, %g2 | ||
| 125 | wrpr %g2, PSTATE_IE, %pstate | 135 | wrpr %g2, PSTATE_IE, %pstate |
| 126 | rdpr %otherwin, %g1 | 136 | rdpr %otherwin, %g1 |
| 127 | rdpr %cansave, %g3 | 137 | rdpr %cansave, %g3 |
| @@ -129,7 +139,7 @@ sparc_exit: | |||
| 129 | wrpr %g3, 0x0, %cansave | 139 | wrpr %g3, 0x0, %cansave |
| 130 | wrpr %g0, 0x0, %otherwin | 140 | wrpr %g0, 0x0, %otherwin |
| 131 | wrpr %g2, 0x0, %pstate | 141 | wrpr %g2, 0x0, %pstate |
| 132 | ba,pt %xcc, sys_exit | 142 | jmpl %g7, %g0 |
| 133 | stb %g0, [%g6 + TI_WSAVED] | 143 | stb %g0, [%g6 + TI_WSAVED] |
| 134 | .size sparc_exit,.-sparc_exit | 144 | .size sparc_exit,.-sparc_exit |
| 135 | 145 | ||