diff options
| author | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 11:44:40 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 12:39:31 +0000 |
| commit | 1db758f92133a7700de72801a548964d353e14bf (patch) | |
| tree | 4ad5e29f53fb6876664356de38700ea5b13b6a3a /arch/arm64/include | |
| parent | 2b54b58aacf672bd7a99383ed8a5c01cdac4f3af (diff) | |
| parent | 1b940bbc5c55551a3420f403a2b10cb884cffb01 (diff) | |
Merge tag 'v5.4.56' into 5.4-2.1.x-imx
This is the 5.4.56 stable release
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/alternative.h | 4 | ||||
| -rw-r--r-- | arch/arm64/include/asm/checksum.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h index 12f0eb56a1cc..619db9b4c9d5 100644 --- a/arch/arm64/include/asm/alternative.h +++ b/arch/arm64/include/asm/alternative.h @@ -77,9 +77,9 @@ static inline void apply_alternatives_module(void *start, size_t length) { } "663:\n\t" \ newinstr "\n" \ "664:\n\t" \ - ".previous\n\t" \ ".org . - (664b-663b) + (662b-661b)\n\t" \ - ".org . - (662b-661b) + (664b-663b)\n" \ + ".org . - (662b-661b) + (664b-663b)\n\t" \ + ".previous\n" \ ".endif\n" #define __ALTERNATIVE_CFG_CB(oldinstr, feature, cfg_enabled, cb) \ diff --git a/arch/arm64/include/asm/checksum.h b/arch/arm64/include/asm/checksum.h index d064a50deb5f..5665a3fc14be 100644 --- a/arch/arm64/include/asm/checksum.h +++ b/arch/arm64/include/asm/checksum.h @@ -19,16 +19,17 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) { __uint128_t tmp; u64 sum; + int n = ihl; /* we want it signed */ tmp = *(const __uint128_t *)iph; iph += 16; - ihl -= 4; + n -= 4; tmp += ((tmp >> 64) | (tmp << 64)); sum = tmp >> 64; do { sum += *(const u32 *)iph; iph += 4; - } while (--ihl); + } while (--n > 0); sum += ((sum >> 32) | (sum << 32)); return csum_fold((__force u32)(sum >> 32)); |