diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-02-27 10:18:46 -0500 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-02-27 10:18:46 -0500 |
| commit | 018cbffe6819f6f8db20a0a3acd9bab9bfd667e4 (patch) | |
| tree | fadde2521591998dc653fa094c636e8a547e620d /arch/sparc/kernel/tsb.S | |
| parent | 1dd2980d990068e20045b90c424518cc7f3657ff (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge commit 'v2.6.33' into perf/core
Merge reason:
__percpu annotations need the corresponding sparse address
space definition upstream.
Conflicts:
tools/perf/util/probe-event.c (trivial)
Diffstat (limited to 'arch/sparc/kernel/tsb.S')
| -rw-r--r-- | arch/sparc/kernel/tsb.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc/kernel/tsb.S b/arch/sparc/kernel/tsb.S index 8c91d9b29a2f..db15d123f054 100644 --- a/arch/sparc/kernel/tsb.S +++ b/arch/sparc/kernel/tsb.S | |||
| @@ -191,10 +191,12 @@ tsb_dtlb_load: | |||
| 191 | 191 | ||
| 192 | tsb_itlb_load: | 192 | tsb_itlb_load: |
| 193 | /* Executable bit must be set. */ | 193 | /* Executable bit must be set. */ |
| 194 | 661: andcc %g5, _PAGE_EXEC_4U, %g0 | 194 | 661: sethi %hi(_PAGE_EXEC_4U), %g4 |
| 195 | .section .sun4v_1insn_patch, "ax" | 195 | andcc %g5, %g4, %g0 |
| 196 | .section .sun4v_2insn_patch, "ax" | ||
| 196 | .word 661b | 197 | .word 661b |
| 197 | andcc %g5, _PAGE_EXEC_4V, %g0 | 198 | andcc %g5, _PAGE_EXEC_4V, %g0 |
| 199 | nop | ||
| 198 | .previous | 200 | .previous |
| 199 | 201 | ||
| 200 | be,pn %xcc, tsb_do_fault | 202 | be,pn %xcc, tsb_do_fault |