| From 300d3233d2dcab4ce896da706ce5f4ef65e2831c Mon Sep 17 00:00:00 2001 |
| From: "David S. Miller" <davem@davemloft.net> |
| Date: Thu, 22 Aug 2013 16:38:46 -0700 |
| Subject: sparc64: Fix off by one in trampoline TLB mapping installation loop. |
| |
| From: "David S. Miller" <davem@davemloft.net> |
| |
| [ 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> |
| --- |
| arch/sparc/kernel/trampoline_64.S | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- 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 |
