diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-09-23 14:57:16 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-09-23 14:57:16 +0200 |
| commit | 0565f49cfe937640c2347f6d7f40ad2f4e4f088b (patch) | |
| tree | 6067447df39c37946bc2de3ee004f45957bf123e /arch/x86/lib/hweight.S | |
| parent | Merge branch 'gpio-irq-validmask' into devel (diff) | |
| parent | Linux 4.8-rc6 (diff) | |
| download | linux-0565f49cfe937640c2347f6d7f40ad2f4e4f088b.tar.xz linux-0565f49cfe937640c2347f6d7f40ad2f4e4f088b.zip | |
Merge tag 'v4.8-rc6' into devel
Linux 4.8-rc6
Diffstat (limited to 'arch/x86/lib/hweight.S')
| -rw-r--r-- | arch/x86/lib/hweight.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/lib/hweight.S b/arch/x86/lib/hweight.S index 02de3d74d2c5..8a602a1e404a 100644 --- a/arch/x86/lib/hweight.S +++ b/arch/x86/lib/hweight.S @@ -35,6 +35,7 @@ ENDPROC(__sw_hweight32) ENTRY(__sw_hweight64) #ifdef CONFIG_X86_64 + pushq %rdi pushq %rdx movq %rdi, %rdx # w -> t @@ -60,6 +61,7 @@ ENTRY(__sw_hweight64) shrq $56, %rax # w = w_tmp >> 56 popq %rdx + popq %rdi ret #else /* CONFIG_X86_32 */ /* We're getting an u64 arg in (%eax,%edx): unsigned long hweight64(__u64 w) */ |