diff options
| author |   Jan Engelhardt <jengelh@inai.de> | 2017-12-25 03:43:53 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-12-27 20:29:48 -0500 |
| commit | 59585b4be9ae4dc6506551709bdcd6f5210b8a01 (patch) | |
| tree | 6c0dd0ddd572999f41f2574a5cdb90c9068d2646 | |
| parent | Merge tag 'trace-v4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
| download | linux-dev-59585b4be9ae4dc6506551709bdcd6f5210b8a01.tar.xz linux-dev-59585b4be9ae4dc6506551709bdcd6f5210b8a01.zip | |
sparc64: repair calling incorrect hweight function from stubs
Commit v4.12-rc4-1-g9289ea7f952b introduced a mistake that made the
64-bit hweight stub call the 16-bit hweight function.
Fixes: 9289ea7f952b ("sparc64: Use indirect calls in hamming weight stubs")
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/lib/hweight.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/lib/hweight.S b/arch/sparc/lib/hweight.S index e5547b22cd18..0ddbbb031822 100644 --- a/arch/sparc/lib/hweight.S +++ b/arch/sparc/lib/hweight.S @@ -44,8 +44,8 @@ EXPORT_SYMBOL(__arch_hweight32) .previous ENTRY(__arch_hweight64) - sethi %hi(__sw_hweight16), %g1 - jmpl %g1 + %lo(__sw_hweight16), %g0 + sethi %hi(__sw_hweight64), %g1 + jmpl %g1 + %lo(__sw_hweight64), %g0 nop ENDPROC(__arch_hweight64) EXPORT_SYMBOL(__arch_hweight64) |