tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Will Deacon:
"The main one is to fix the build after Willy's per-cpu entropy changes
this week. Although that was already resolved elsewhere, the arm64 fix
here is useful cleanup anyway.

Other than that, we've got a fix for building with Clang's integrated
assembler and a fix to make our IPv4 checksumming robust against
invalid header lengths (this only seems to be triggerable by injected
errors).

- Fix build breakage due to circular headers

- Fix build regression when using Clang's integrated assembler

- Fix IPv4 header checksum code to deal with invalid length field

- Fix broken path for Arm PMU entry in MAINTAINERS"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
MAINTAINERS: Include drivers subdirs for ARM PMU PROFILING AND DEBUGGING entry
arm64: csum: Fix handling of bad packets
arm64: Drop unnecessary include from asm/smp.h
arm64/alternatives: move length validation inside the subsection

Linus Torvalds 14aab7ee c1954ca6

+6 -6
+1 -1
MAINTAINERS
··· 1425 1425 F: arch/arm*/kernel/hw_breakpoint.c 1426 1426 F: arch/arm*/kernel/perf_* 1427 1427 F: arch/arm/oprofile/common.c 1428 - F: drivers/perf/* 1428 + F: drivers/perf/ 1429 1429 F: include/linux/perf/arm_pmu.h 1430 1430 1431 1431 ARM PORT
+2 -2
arch/arm64/include/asm/alternative.h
··· 77 77 "663:\n\t" \ 78 78 newinstr "\n" \ 79 79 "664:\n\t" \ 80 - ".previous\n\t" \ 81 80 ".org . - (664b-663b) + (662b-661b)\n\t" \ 82 - ".org . - (662b-661b) + (664b-663b)\n" \ 81 + ".org . - (662b-661b) + (664b-663b)\n\t" \ 82 + ".previous\n" \ 83 83 ".endif\n" 84 84 85 85 #define __ALTERNATIVE_CFG_CB(oldinstr, feature, cfg_enabled, cb) \
+3 -2
arch/arm64/include/asm/checksum.h
··· 24 24 { 25 25 __uint128_t tmp; 26 26 u64 sum; 27 + int n = ihl; /* we want it signed */ 27 28 28 29 tmp = *(const __uint128_t *)iph; 29 30 iph += 16; 30 - ihl -= 4; 31 + n -= 4; 31 32 tmp += ((tmp >> 64) | (tmp << 64)); 32 33 sum = tmp >> 64; 33 34 do { 34 35 sum += *(const u32 *)iph; 35 36 iph += 4; 36 - } while (--ihl); 37 + } while (--n > 0); 37 38 38 39 sum += ((sum >> 32) | (sum << 32)); 39 40 return csum_fold((__force u32)(sum >> 32));
-1
arch/arm64/include/asm/smp.h
··· 30 30 #include <linux/threads.h> 31 31 #include <linux/cpumask.h> 32 32 #include <linux/thread_info.h> 33 - #include <asm/pointer_auth.h> 34 33 35 34 DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number); 36 35