projects/linux·commit 4056b3c9

Merge tag 'nios2_update_for_v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux

4056b3c9 · Linus Torvalds <[email protected]> · 2026-10-13 18:06:58 -07:00

Pull NIOS2 fix from Dinh Nguyen:

 - Fix __wsum type degradation in csum_fold()

* tag 'nios2_update_for_v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  nios2: fix __wsum type degradation in csum_fold()
Commit
4056b3c9d3c92ea45955641dbafeb9b960e146ef
Parents
d77bd0d4 · b963f234

Merge commit. Changes below are compared with the first parent: d77bd0d4.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
arch/nios2/include/asm/checksum.hmodified+1−1View file

arch/nios2/include/asm/checksum.h

View file
diff --git a/arch/nios2/include/asm/checksum.h b/arch/nios2/include/asm/checksum.h
index 69004e0..b6b415a 100644
--- a/arch/nios2/include/asm/checksum.h
+++ b/arch/nios2/include/asm/checksum.h
@@ -27,7 +27,7 @@ static inline __sum16 csum_fold(__wsum sum)
"add %0, %0, r8\n"
"nor %0, %0, %0\n"
: "=r" (sum)
- : "r" (sum << 16), "0" (sum)
+ : "r" ((__force u32)sum << 16), "0" (sum)
: "r8");
return (__force __sum16) sum;
}