diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-31 10:39:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-31 10:39:22 -0800 |
| commit | 6bba94d07f70d2b36e2975b0fdefe0085ea53e09 (patch) | |
| tree | 407abae95c07df98f2ef9a38c54f8fb5286d4ccb | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
| parent | sparc64: repair calling incorrect hweight function from stubs (diff) | |
| download | linux-dev-6bba94d07f70d2b36e2975b0fdefe0085ea53e09.tar.xz linux-dev-6bba94d07f70d2b36e2975b0fdefe0085ea53e09.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc bugfix from David Miller.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: repair calling incorrect hweight function from stubs
| -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) |