aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-08-22 16:38:46 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-13 14:51:08 -0700
commite6114d1d56548014e6f5323d8c71e9de61486786 (patch)
tree0214432af5671803fb942fdd59d7c229e860fd48
parentca0bd2082f83ccf6abbb2db2e4475bb81b415118 (diff)
downloadkernel_samsung_smdk4412-e6114d1d56548014e6f5323d8c71e9de61486786.zip
kernel_samsung_smdk4412-e6114d1d56548014e6f5323d8c71e9de61486786.tar.gz
kernel_samsung_smdk4412-e6114d1d56548014e6f5323d8c71e9de61486786.tar.bz2
sparc64: Fix off by one in trampoline TLB mapping installation loop.
[ Upstream commit 63d499662aeec1864ec36d042aca8184ea6a938e ] Reported-by: Kirill Tkhai <tkhai@yandex.ru> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/sparc/kernel/trampoline_64.S2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/trampoline_64.S b/arch/sparc/kernel/trampoline_64.S
index da1b781..8fa84a3 100644
--- a/arch/sparc/kernel/trampoline_64.S
+++ b/arch/sparc/kernel/trampoline_64.S
@@ -131,7 +131,6 @@ startup_continue:
clr %l5
sethi %hi(num_kernel_image_mappings), %l6
lduw [%l6 + %lo(num_kernel_image_mappings)], %l6
- add %l6, 1, %l6
mov 15, %l7
BRANCH_IF_ANY_CHEETAH(g1,g5,2f)
@@ -224,7 +223,6 @@ niagara_lock_tlb:
clr %l5
sethi %hi(num_kernel_image_mappings), %l6
lduw [%l6 + %lo(num_kernel_image_mappings)], %l6
- add %l6, 1, %l6
1:
mov HV_FAST_MMU_MAP_PERM_ADDR, %o5