]> git.hungrycats.org Git - linux/commitdiff
sparc64: Fix off by one in trampoline TLB mapping installation loop.
authorDavid S. Miller <davem@davemloft.net>
Thu, 22 Aug 2013 23:38:46 +0000 (16:38 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Oct 2013 01:14:29 +0000 (18:14 -0700)
[ 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

index e0b1e13a073610da16810288dab254c43b9feb49..ad4bde3bb61e6763df6baf6c44b9b0f7be921f7b 100644 (file)
@@ -129,7 +129,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)
@@ -222,7 +221,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