diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2022-01-31 03:25:53 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2022-01-31 03:26:39 +0100 |
| commit | 6692531df62d812de5d22c8bca0d90edc163aa84 (patch) | |
| tree | 1d5b5b7ef15676ad8f95a80834b1a2e9a2da2a97 /arch/x86/lib | |
| parent | asm/user.h: killed unused macros (diff) | |
| download | linux-6692531df62d812de5d22c8bca0d90edc163aa84.tar.xz linux-6692531df62d812de5d22c8bca0d90edc163aa84.zip | |
uml/x86: use x86 load_unaligned_zeropad()
allows, among other things, to drop !DCACHE_WORD_ACCESS mess in
x86 csum-partial_64.c
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/csum-partial_64.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/x86/lib/csum-partial_64.c b/arch/x86/lib/csum-partial_64.c index 1f8a8f895173..50734a23034c 100644 --- a/arch/x86/lib/csum-partial_64.c +++ b/arch/x86/lib/csum-partial_64.c @@ -93,7 +93,6 @@ __wsum csum_partial(const void *buff, int len, __wsum sum) buff += 8; } if (len & 7) { -#ifdef CONFIG_DCACHE_WORD_ACCESS unsigned int shift = (8 - (len & 7)) * 8; unsigned long trail; @@ -103,31 +102,6 @@ __wsum csum_partial(const void *buff, int len, __wsum sum) "adcq $0,%[res]" : [res] "+r" (temp64) : [trail] "r" (trail)); -#else - if (len & 4) { - asm("addq %[val],%[res]\n\t" - "adcq $0,%[res]" - : [res] "+r" (temp64) - : [val] "r" ((u64)*(u32 *)buff) - : "memory"); - buff += 4; - } - if (len & 2) { - asm("addq %[val],%[res]\n\t" - "adcq $0,%[res]" - : [res] "+r" (temp64) - : [val] "r" ((u64)*(u16 *)buff) - : "memory"); - buff += 2; - } - if (len & 1) { - asm("addq %[val],%[res]\n\t" - "adcq $0,%[res]" - : [res] "+r" (temp64) - : [val] "r" ((u64)*(u8 *)buff) - : "memory"); - } -#endif } result = add32_with_carry(temp64 >> 32, temp64 & 0xffffffff); if (unlikely(odd)) { |