diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-05 11:27:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-05 11:27:23 +0200 |
| commit | bce6824cc8e86619901265b7e77c59cc9d99e05b (patch) | |
| tree | ad118914e1374c2ccd06999bc24bd2708897ff7f /arch/x86/lib/checksum_32.S | |
| parent | 494b5168f2de009eb80f198f668da374295098dd (diff) | |
| parent | c0554d2d3db438623b4f2f9abc3d766b2b15d2fb (diff) | |
| download | linux-bce6824cc8e86619901265b7e77c59cc9d99e05b.tar.bz2 | |
Merge branch 'x86/core' into x86/build, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/lib/checksum_32.S')
| -rw-r--r-- | arch/x86/lib/checksum_32.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S index 46e71a74e612..ad8e0906d1ea 100644 --- a/arch/x86/lib/checksum_32.S +++ b/arch/x86/lib/checksum_32.S @@ -273,11 +273,11 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst, #define SRC(y...) \ 9999: y; \ - _ASM_EXTABLE(9999b, 6001f) + _ASM_EXTABLE_UA(9999b, 6001f) #define DST(y...) \ 9999: y; \ - _ASM_EXTABLE(9999b, 6002f) + _ASM_EXTABLE_UA(9999b, 6002f) #ifndef CONFIG_X86_USE_PPRO_CHECKSUM |