diff options
author | David S. Miller <davem@davemloft.net> | 2013-08-22 19:38:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-22 19:38:46 -0400 |
commit | 63d499662aeec1864ec36d042aca8184ea6a938e (patch) | |
tree | 4e5073360ac7740482c6618ca2f487530a007dcb /arch/sparc | |
parent | 1c2696cdaad84580545a2e9c0879ff597880b1a9 (diff) |
sparc64: Fix off by one in trampoline TLB mapping installation loop.
Reported-by: Kirill Tkhai <tkhai@yandex.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/trampoline_64.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/trampoline_64.S b/arch/sparc/kernel/trampoline_64.S index e0b1e13a0736..ad4bde3bb61e 100644 --- a/arch/sparc/kernel/trampoline_64.S +++ b/arch/sparc/kernel/trampoline_64.S | |||
@@ -129,7 +129,6 @@ startup_continue: | |||
129 | clr %l5 | 129 | clr %l5 |
130 | sethi %hi(num_kernel_image_mappings), %l6 | 130 | sethi %hi(num_kernel_image_mappings), %l6 |
131 | lduw [%l6 + %lo(num_kernel_image_mappings)], %l6 | 131 | lduw [%l6 + %lo(num_kernel_image_mappings)], %l6 |
132 | add %l6, 1, %l6 | ||
133 | 132 | ||
134 | mov 15, %l7 | 133 | mov 15, %l7 |
135 | BRANCH_IF_ANY_CHEETAH(g1,g5,2f) | 134 | BRANCH_IF_ANY_CHEETAH(g1,g5,2f) |
@@ -222,7 +221,6 @@ niagara_lock_tlb: | |||
222 | clr %l5 | 221 | clr %l5 |
223 | sethi %hi(num_kernel_image_mappings), %l6 | 222 | sethi %hi(num_kernel_image_mappings), %l6 |
224 | lduw [%l6 + %lo(num_kernel_image_mappings)], %l6 | 223 | lduw [%l6 + %lo(num_kernel_image_mappings)], %l6 |
225 | add %l6, 1, %l6 | ||
226 | 224 | ||
227 | 1: | 225 | 1: |
228 | mov HV_FAST_MMU_MAP_PERM_ADDR, %o5 | 226 | mov HV_FAST_MMU_MAP_PERM_ADDR, %o5 |