Commit 6bba94d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 71ee2033 59585b4b

arch/sparc/lib/hweight.S

+2 −2
Original line number Diff line number Diff line
@@ -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)