[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: e798906aa4e1b565f6ff8c3e0dce71454da0dabd Author: Mike Pagano gentoo org> AuthorDate: Fri Dec 1 10:32:44 2023 + Commit: Mike Pagano gentoo org> CommitDate: Fri Dec 1 10:32:44 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=e798906a neighbour: Fix __randomize_layout crash in struct neighbour Bug: https://bugs.gentoo.org/918128 Signed-off-by: Mike Pagano gentoo.org> _README| 4 ++ ...ix_randomize_layout_crash_in_struct_neigh.patch | 44 ++ 2 files changed, 48 insertions(+) diff --git a/_README b/_README index 12ba051a..fc63225f 100644 --- a/_README +++ b/_README @@ -111,6 +111,10 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-mar...@holtmann.org/raw Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 +Patch: 2010_Fix_randomize_layout_crash_in_struct_neigh.patch +From: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=45b3fae4675d +Desc: neighbour: Fix __randomize_layout crash in struct neighbour + Patch: 2900_tmp513-Fix-build-issue-by-selecting-CONFIG_REG.patch From: https://bugs.gentoo.org/710790 Desc: tmp513 requies REGMAP_I2C to build. Select it by default in Kconfig. See bug #710790. Thanks to Phil Stracchino diff --git a/2010_Fix_randomize_layout_crash_in_struct_neigh.patch b/2010_Fix_randomize_layout_crash_in_struct_neigh.patch new file mode 100644 index ..8ee50b2f --- /dev/null +++ b/2010_Fix_randomize_layout_crash_in_struct_neigh.patch @@ -0,0 +1,44 @@ +From 45b3fae4675dc1d4ee2d7aefa19d85ee4f891377 Mon Sep 17 00:00:00 2001 +From: "Gustavo A. R. Silva" +Date: Sat, 25 Nov 2023 15:33:58 -0600 +Subject: neighbour: Fix __randomize_layout crash in struct neighbour + +Previously, one-element and zero-length arrays were treated as true +flexible arrays, even though they are actually "fake" flex arrays. +The __randomize_layout would leave them untouched at the end of the +struct, similarly to proper C99 flex-array members. + +However, this approach changed with commit 1ee60356c2dc ("gcc-plugins: +randstruct: Only warn about true flexible arrays"). Now, only C99 +flexible-array members will remain untouched at the end of the struct, +while one-element and zero-length arrays will be subject to randomization. + +Fix a `__randomize_layout` crash in `struct neighbour` by transforming +zero-length array `primary_key` into a proper C99 flexible-array member. + +Fixes: 1ee60356c2dc ("gcc-plugins: randstruct: Only warn about true flexible arrays") +Closes: https://lore.kernel.org/linux-hardening/20231124102458.gb1503...@e124191.cambridge.arm.com/ +Signed-off-by: Gustavo A. R. Silva +Reviewed-by: Kees Cook +Tested-by: Joey Gouly +Link: https://lore.kernel.org/r/ZWJoRsJGnCPdJ3+2@work +Signed-off-by: Paolo Abeni +--- + include/net/neighbour.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/net/neighbour.h b/include/net/neighbour.h +index 07022bb0d44d4b..0d28172193fa63 100644 +--- a/include/net/neighbour.h b/include/net/neighbour.h +@@ -162,7 +162,7 @@ struct neighbour { + struct rcu_head rcu; + struct net_device *dev; + netdevice_tracker dev_tracker; +- u8 primary_key[0]; ++ u8 primary_key[]; + } __randomize_layout; + + struct neigh_ops { +-- +cgit
[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: 4f42445d6ec6dc05fb74d5547df42572cef288e3 Author: Mike Pagano gentoo org> AuthorDate: Thu Nov 9 17:59:40 2023 + Commit: Mike Pagano gentoo org> CommitDate: Thu Nov 9 17:59:40 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=4f42445d Remove patch, as the issue is fixed Removed: 1805_mm-disable-CONFIG-PER-VMA-LOCK-by-def.patch Signed-off-by: Mike Pagano gentoo.org> _README | 4 --- 1805_mm-disable-CONFIG-PER-VMA-LOCK-by-def.patch | 35 2 files changed, 39 deletions(-) diff --git a/_README b/_README index 2dc5ce55..28310de0 100644 --- a/_README +++ b/_README @@ -99,10 +99,6 @@ Patch: 1700_sparc-address-warray-bound-warnings.patch From: https://github.com/KSPP/linux/issues/109 Desc: Address -Warray-bounds warnings -Patch: 1805_mm-disable-CONFIG-PER-VMA-LOCK-by-def.patch -From: https://lore.kernel.org/all/20230703182150.2193578-1-sur...@google.com/ -Desc: mm: disable CONFIG_PER_VMA_LOCK by default until its fixed - Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-mar...@holtmann.org/raw Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 diff --git a/1805_mm-disable-CONFIG-PER-VMA-LOCK-by-def.patch b/1805_mm-disable-CONFIG-PER-VMA-LOCK-by-def.patch deleted file mode 100644 index c98255a6.. --- a/1805_mm-disable-CONFIG-PER-VMA-LOCK-by-def.patch +++ /dev/null @@ -1,35 +0,0 @@ -Subject: [PATCH 1/1] mm: disable CONFIG_PER_VMA_LOCK by default until its fixed -Date: Mon, 3 Jul 2023 11:21:50 -0700 [thread overview] -Message-ID: <20230703182150.2193578-1-sur...@google.com> (raw) - -A memory corruption was reported in [1] with bisection pointing to the -patch [2] enabling per-VMA locks for x86. -Disable per-VMA locks config to prevent this issue while the problem is -being investigated. This is expected to be a temporary measure. - -[1] https://bugzilla.kernel.org/show_bug.cgi?id=217624 -[2] https://lore.kernel.org/all/20230227173632.3292573-30-sur...@google.com - -Reported-by: Jiri Slaby -Reported-by: Jacob Young -Fixes: 0bff0aaea03e ("x86/mm: try VMA lock-based page fault handling first") -Signed-off-by: Suren Baghdasaryan - mm/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mm/Kconfig b/mm/Kconfig -index 09130434e30d..de94b2497600 100644 a/mm/Kconfig -+++ b/mm/Kconfig -@@ -1224,7 +1224,7 @@ config ARCH_SUPPORTS_PER_VMA_LOCK -def_bool n - - config PER_VMA_LOCK -- def_bool y -+ bool "Enable per-vma locking during page fault handling." - depends on ARCH_SUPPORTS_PER_VMA_LOCK && MMU && SMP - help - Allow per-vma locking during page fault handling. --- -2.41.0.255.g8b1d071c50-goog
[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: 24837d3d782dd30d999114233051802c7df60801 Author: Mike Pagano gentoo org> AuthorDate: Wed Nov 8 14:01:14 2023 + Commit: Mike Pagano gentoo org> CommitDate: Wed Nov 8 14:01:14 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=24837d3d Linux patch 6.5.11 Signed-off-by: Mike Pagano gentoo.org> _README |4 + 1010_linux-6.5.11.patch | 3169 +++ 2 files changed, 3173 insertions(+) diff --git a/_README b/_README index 5af72671..2dc5ce55 100644 --- a/_README +++ b/_README @@ -83,6 +83,10 @@ Patch: 1009_linux-6.5.10.patch From: https://www.kernel.org Desc: Linux 6.5.10 +Patch: 1010_linux-6.5.11.patch +From: https://www.kernel.org +Desc: Linux 6.5.11 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1010_linux-6.5.11.patch b/1010_linux-6.5.11.patch new file mode 100644 index ..48d04e35 --- /dev/null +++ b/1010_linux-6.5.11.patch @@ -0,0 +1,3169 @@ +diff --git a/Documentation/devicetree/bindings/serial/rs485.yaml b/Documentation/devicetree/bindings/serial/rs485.yaml +index 303a443d9e29b..9418fd66a8e95 100644 +--- a/Documentation/devicetree/bindings/serial/rs485.yaml b/Documentation/devicetree/bindings/serial/rs485.yaml +@@ -29,6 +29,10 @@ properties: + default: 0 + maximum: 100 + ++ rs485-rts-active-high: ++description: drive RTS high when sending (this is the default). ++$ref: /schemas/types.yaml#/definitions/flag ++ + rs485-rts-active-low: + description: drive RTS low when sending (default is high). + $ref: /schemas/types.yaml#/definitions/flag +diff --git a/Makefile b/Makefile +index ab9f291c1d3f7..555cc34f47301 100644 +--- a/Makefile b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 6 + PATCHLEVEL = 5 +-SUBLEVEL = 10 ++SUBLEVEL = 11 + EXTRAVERSION = + NAME = Hurr durr I'ma ninja sloth + +diff --git a/arch/arm64/boot/dts/freescale/imx93.dtsi b/arch/arm64/boot/dts/freescale/imx93.dtsi +index 1d8dd14b65cfa..2a9b89bf52698 100644 +--- a/arch/arm64/boot/dts/freescale/imx93.dtsi b/arch/arm64/boot/dts/freescale/imx93.dtsi +@@ -146,7 +146,7 @@ + #size-cells = <1>; + ranges; + +- anomix_ns_gpr: syscon@4421 { ++ aonmix_ns_gpr: syscon@4421 { + compatible = "fsl,imx93-aonmix-ns-syscfg", "syscon"; + reg = <0x4421 0x1000>; + }; +@@ -280,6 +280,7 @@ + assigned-clock-parents = < IMX93_CLK_SYS_PLL_PFD1_DIV2>; + assigned-clock-rates = <4000>; + fsl,clk-source = /bits/ 8 <0>; ++ fsl,stop-mode = <_ns_gpr 0x14 0>; + status = "disabled"; + }; + +@@ -532,6 +533,7 @@ + assigned-clock-parents = < IMX93_CLK_SYS_PLL_PFD1_DIV2>; + assigned-clock-rates = <4000>; + fsl,clk-source = /bits/ 8 <0>; ++ fsl,stop-mode = <_gpr 0x0c 2>; + status = "disabled"; + }; + +diff --git a/arch/loongarch/include/asm/io.h b/arch/loongarch/include/asm/io.h +index 1c94102200407..0355b64e90ed0 100644 +--- a/arch/loongarch/include/asm/io.h b/arch/loongarch/include/asm/io.h +@@ -54,10 +54,9 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset, unsigned long size, + * @offset:bus address of the memory + * @size: size of the resource to map + */ +-extern pgprot_t pgprot_wc; +- + #define ioremap_wc(offset, size) \ +- ioremap_prot((offset), (size), pgprot_val(pgprot_wc)) ++ ioremap_prot((offset), (size), \ ++ pgprot_val(wc_enabled ? PAGE_KERNEL_WUC : PAGE_KERNEL_SUC)) + + #define ioremap_cache(offset, size) \ + ioremap_prot((offset), (size), pgprot_val(PAGE_KERNEL)) +diff --git a/arch/loongarch/include/asm/linkage.h b/arch/loongarch/include/asm/linkage.h +index 81b0c4cfbf4f2..e2eca1a25b4ef 100644 +--- a/arch/loongarch/include/asm/linkage.h b/arch/loongarch/include/asm/linkage.h +@@ -33,4 +33,12 @@ + .cfi_endproc; \ + SYM_END(name, SYM_T_FUNC) + ++#define SYM_CODE_START(name) \ ++ SYM_START(name, SYM_L_GLOBAL, SYM_A_ALIGN) \ ++ .cfi_startproc; ++ ++#define SYM_CODE_END(name)\ ++ .cfi_endproc; \ ++ SYM_END(name, SYM_T_NONE) ++ + #endif +diff --git a/arch/loongarch/include/asm/pgtable-bits.h b/arch/loongarch/include/asm/pgtable-bits.h +index
[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: 51bcb2538941016f4ebd47dcc0c878f26a105a0c Author: Mike Pagano gentoo org> AuthorDate: Sun Oct 22 22:50:47 2023 + Commit: Mike Pagano gentoo org> CommitDate: Sun Oct 22 22:50:47 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=51bcb253 kbuild: Use CRC32 and a 1MiB dictionary for XZ compressed modules Signed-off-by: Mike Pagano gentoo.org> _README | 4 +++ 2950_kbuild-CRC32-1MB-dict-xz-modules.patch | 38 + 2 files changed, 42 insertions(+) diff --git a/_README b/_README index 97163ce5..0f2b2d88 100644 --- a/_README +++ b/_README @@ -115,6 +115,10 @@ Patch: 2940_handle-gcc-14-last-stmt-rename.patch From: https://lore.kernel.org/all/20230811060545.never.564-k...@kernel.org/#Z31scripts:gcc-plugins:gcc-common.h Desc: gcc-plugins: Rename last_stmt() for GCC 14+ +Patch: 2950_kbuild-CRC32-1MB-dict-xz-modules.patch +From: https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit/?h=kbuild=fbf5892df21a8ccfcb2fda0fd65bc3169c89ed28 +Desc: kbuild: Use CRC32 and a 1MiB dictionary for XZ compressed modules + Patch: 3000_Support-printing-firmware-info.patch From: https://bugs.gentoo.org/732852 Desc: Print firmware info (Reqs CONFIG_GENTOO_PRINT_FIRMWARE_INFO). Thanks to Georgy Yakovlev diff --git a/2950_kbuild-CRC32-1MB-dict-xz-modules.patch b/2950_kbuild-CRC32-1MB-dict-xz-modules.patch new file mode 100644 index ..32090343 --- /dev/null +++ b/2950_kbuild-CRC32-1MB-dict-xz-modules.patch @@ -0,0 +1,38 @@ +From fbf5892df21a8ccfcb2fda0fd65bc3169c89ed28 Mon Sep 17 00:00:00 2001 +From: Martin Nybo Andersen +Date: Fri, 15 Sep 2023 12:15:39 +0200 +Subject: kbuild: Use CRC32 and a 1MiB dictionary for XZ compressed modules + +Kmod is now (since kmod commit 09c9f8c5df04 ("libkmod: Use kernel +decompression when available")) using the kernel decompressor, when +loading compressed modules. + +However, the kernel XZ decompressor is XZ Embedded, which doesn't +handle CRC64 and dictionaries larger than 1MiB. + +Use CRC32 and 1MiB dictionary when XZ compressing and installing +kernel modules. + +Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050582 +Signed-off-by: Martin Nybo Andersen +Signed-off-by: Masahiro Yamada +--- + scripts/Makefile.modinst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst +index 346f5ec506823..0afd75472679f 100644 +--- a/scripts/Makefile.modinst b/scripts/Makefile.modinst +@@ -144,7 +144,7 @@ endif + quiet_cmd_gzip = GZIP$@ + cmd_gzip = $(KGZIP) -n -f $< + quiet_cmd_xz = XZ $@ +- cmd_xz = $(XZ) --lzma2=dict=2MiB -f $< ++ cmd_xz = $(XZ) --check=crc32 --lzma2=dict=1MiB -f $< + quiet_cmd_zstd = ZSTD$@ + cmd_zstd = $(ZSTD) -T0 --rm -f -q $< + +-- +cgit +
[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: 10a9a6bf7b7d62357104ce0079711f0ccdbde3e2 Author: Mike Pagano gentoo org> AuthorDate: Wed Oct 18 19:54:56 2023 + Commit: Mike Pagano gentoo org> CommitDate: Wed Oct 18 19:54:56 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=10a9a6bf gcc-plugins: Rename last_stmt() for GCC 14+ Signed-off-by: Mike Pagano gentoo.org> _README | 4 2940_handle-gcc-14-last-stmt-rename.patch | 31 +++ 2 files changed, 35 insertions(+) diff --git a/_README b/_README index 665fa5a2..86ea0adc 100644 --- a/_README +++ b/_README @@ -107,6 +107,10 @@ Patch: 2930_tar_override.patch From: https://lore.kernel.org/lkml/20230412082743.350699-1-mgo...@gentoo.org/#t Desc: kheaders: make it possible to override TAR +Patch: 2940_handle-gcc-14-last-stmt-rename.patch +From: https://lore.kernel.org/all/20230811060545.never.564-k...@kernel.org/#Z31scripts:gcc-plugins:gcc-common.h +Desc: gcc-plugins: Rename last_stmt() for GCC 14+ + Patch: 3000_Support-printing-firmware-info.patch From: https://bugs.gentoo.org/732852 Desc: Print firmware info (Reqs CONFIG_GENTOO_PRINT_FIRMWARE_INFO). Thanks to Georgy Yakovlev diff --git a/2940_handle-gcc-14-last-stmt-rename.patch b/2940_handle-gcc-14-last-stmt-rename.patch new file mode 100644 index ..b04ce8da --- /dev/null +++ b/2940_handle-gcc-14-last-stmt-rename.patch @@ -0,0 +1,31 @@ +From: Kees Cook +To: linux-harden...@vger.kernel.org +Cc: Kees Cook , linux-ker...@vger.kernel.org +Subject: [PATCH] gcc-plugins: Rename last_stmt() for GCC 14+ +Date: Thu, 10 Aug 2023 23:05:49 -0700 [thread overview] +Message-ID: <20230811060545.never.564-k...@kernel.org> (raw) + +In GCC 14, last_stmt() was renamed to last_nondebug_stmt(). Add a helper +macro to handle the renaming. + +Cc: linux-harden...@vger.kernel.org +Signed-off-by: Kees Cook +--- + scripts/gcc-plugins/gcc-common.h | 4 + 1 file changed, 4 insertions(+) + +diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h +index 84c730da36dd..1ae39b9f4a95 100644 +--- a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h +@@ -440,4 +440,8 @@ static inline void debug_gimple_stmt(const_gimple s) + #define SET_DECL_MODE(decl, mode) DECL_MODE(decl) = (mode) + #endif + ++#if BUILDING_GCC_VERSION >= 14000 ++#define last_stmt(x) last_nondebug_stmt(x) ++#endif ++ + #endif +-- +2.34.1
[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: 94bc701a20b843aee37fe6700f5a4e2c9c0d15a2 Author: Mike Pagano gentoo org> AuthorDate: Tue Oct 17 22:53:48 2023 + Commit: Mike Pagano gentoo org> CommitDate: Tue Oct 17 22:53:48 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=94bc701a kheaders: make it possible to override TAR Signed-off-by: Mike Pagano gentoo.org> _README | 4 +++ 2930_tar_override.patch | 65 + 2 files changed, 69 insertions(+) diff --git a/_README b/_README index 7be69feb..665fa5a2 100644 --- a/_README +++ b/_README @@ -103,6 +103,10 @@ Patch: 2920_sign-file-patch-for-libressl.patch From: https://bugs.gentoo.org/717166 Desc: sign-file: full functionality with modern LibreSSL +Patch: 2930_tar_override.patch +From: https://lore.kernel.org/lkml/20230412082743.350699-1-mgo...@gentoo.org/#t +Desc: kheaders: make it possible to override TAR + Patch: 3000_Support-printing-firmware-info.patch From: https://bugs.gentoo.org/732852 Desc: Print firmware info (Reqs CONFIG_GENTOO_PRINT_FIRMWARE_INFO). Thanks to Georgy Yakovlev diff --git a/2930_tar_override.patch b/2930_tar_override.patch new file mode 100644 index ..001ff800 --- /dev/null +++ b/2930_tar_override.patch @@ -0,0 +1,65 @@ +From: "Michał Górny" +To: Dmitry Goldin +Cc: "Masahiro Yamada" , + linux-ker...@vger.kernel.org, "Michał Górny" , + "Sam James" , + "Masahiro Yamada" +Subject: [PATCH v2] kheaders: make it possible to override TAR +Date: Wed, 12 Apr 2023 10:27:43 +0200 [thread overview] +Message-ID: <20230412082743.350699-1-mgo...@gentoo.org> (raw) +In-Reply-To: + +Commit 86cdd2fdc4e39c388d39c7ba2396d1a9dfd66226 ("kheaders: make headers +archive reproducible") introduced a number of options specific to GNU +tar to the `tar` invocation in `gen_kheaders.sh` script. This causes +the script to fail to work on systems where `tar` is not GNU tar. This +can occur e.g. on recent Gentoo Linux installations that support using +bsdtar from libarchive instead. + +Add a `TAR` make variable to make it possible to override the tar +executable used, e.g. by specifying: + + make TAR=gtar + +Link: https://bugs.gentoo.org/884061 +Reported-by: Sam James +Tested-by: Sam James +Co-developed-by: Masahiro Yamada +Signed-off-by: Michał Górny +--- + Makefile | 3 ++- + kernel/gen_kheaders.sh | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 5aeea3d98..50045059c 100644 +--- a/Makefile b/Makefile +@@ -520,6 +520,7 @@ LZMA = lzma + LZ4 = lz4c + XZ= xz + ZSTD = zstd ++TAR = tar + + PAHOLE_FLAGS = $(shell PAHOLE=$(PAHOLE) $(srctree)/scripts/pahole-flags.sh) + +@@ -599,7 +600,7 @@ export RUSTC RUSTDOC RUSTFMT RUSTC_OR_CLIPPY_QUIET RUSTC_OR_CLIPPY BINDGEN CARGO + export HOSTRUSTC KBUILD_HOSTRUSTFLAGS + export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL + export PERL PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX +-export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD ++export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD TAR + export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE + export KBUILD_USERCFLAGS KBUILD_USERLDFLAGS + +--- a/kernel/gen_kheaders.sh 2023-10-17 18:43:00.365033993 -0400 b/kernel/gen_kheaders.sh 2023-10-17 18:43:36.301750445 -0400 +@@ -83,7 +83,7 @@ find $cpio_dir -type f -print0 | + xargs -0 -P8 -n1 perl -pi -e 'BEGIN {undef $/;}; s/\/\*((?!SPDX).)*?\*\///smg;' + + # Create archive and try to normalize metadata for reproducibility. +-tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \ ++${TAR:-tar} "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \ + --owner=0 --group=0 --sort=name --numeric-owner \ + -I $XZ -cf $tarfile -C $cpio_dir/ . > /dev/null +
[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: d33625c328ad5ceea02a40310cf7b849022ef7bf Author: Mike Pagano gentoo org> AuthorDate: Thu Oct 5 14:04:01 2023 + Commit: Mike Pagano gentoo org> CommitDate: Thu Oct 5 14:07:47 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=d33625c3 select BLK_DEV_BSG if SCSI as it depends on it. Thanks, Ancient. Signed-off-by: Mike Pagano gentoo.org> 4567_distro-Gentoo-Kconfig.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4567_distro-Gentoo-Kconfig.patch b/4567_distro-Gentoo-Kconfig.patch index bd7b76ca..d215166c 100644 --- a/4567_distro-Gentoo-Kconfig.patch +++ b/4567_distro-Gentoo-Kconfig.patch @@ -122,7 +122,7 @@ + depends on GENTOO_LINUX && GENTOO_LINUX_UDEV + + select AUTOFS_FS -+ select BLK_DEV_BSG ++ select BLK_DEV_BSG if SCSI + select BPF_SYSCALL + select CGROUP_BPF + select CGROUPS
[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: 6cbe2eab5cac5d19329f52e8d63c493e90d05a2c Author: Mike Pagano gentoo org> AuthorDate: Sat Sep 23 11:08:14 2023 + Commit: Mike Pagano gentoo org> CommitDate: Sat Sep 23 11:08:14 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=6cbe2eab Actually remove the redundant patch this time Removed: 1515_selinux-fix-handling-of-empty-opts.patch Signed-off-by: Mike Pagano gentoo.org> 1515_selinux-fix-handling-of-empty-opts.patch | 51 --- 1 file changed, 51 deletions(-) diff --git a/1515_selinux-fix-handling-of-empty-opts.patch b/1515_selinux-fix-handling-of-empty-opts.patch deleted file mode 100644 index 10336ec5.. --- a/1515_selinux-fix-handling-of-empty-opts.patch +++ /dev/null @@ -1,51 +0,0 @@ -selinux: fix handling of empty opts in selinux_fs_context_submount() - -selinux_set_mnt_opts() relies on the fact that the mount options pointer -is always NULL when all options are unset (specifically in its -!selinux_initialized() branch. However, the new -selinux_fs_context_submount() hook breaks this rule by allocating a new -structure even if no options are set. That causes any submount created -before a SELinux policy is loaded to be rejected in -selinux_set_mnt_opts(). - -Fix this by making selinux_fs_context_submount() leave fc->security -set to NULL when there are no options to be copied from the reference -superblock. - -Reported-by: Adam Williamson -Link: https://bugzilla.redhat.com/show_bug.cgi?id=2236345 -Fixes: d80a8f1b58c2 ("vfs, security: Fix automount superblock LSM init problem, preventing NFS sb sharing") -Signed-off-by: Ondrej Mosnacek - security/selinux/hooks.c | 10 -- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c -index 10350534de6d6..2aa0e219d7217 100644 a/security/selinux/hooks.c -+++ b/security/selinux/hooks.c -@@ -2775,14 +2775,20 @@ static int selinux_umount(struct vfsmount *mnt, int flags) - static int selinux_fs_context_submount(struct fs_context *fc, - struct super_block *reference) - { -- const struct superblock_security_struct *sbsec; -+ const struct superblock_security_struct *sbsec = selinux_superblock(reference); - struct selinux_mnt_opts *opts; - -+ /* -+ * Ensure that fc->security remains NULL when no options are set -+ * as expected by selinux_set_mnt_opts(). -+ */ -+ if (!(sbsec->flags & (FSCONTEXT_MNT|CONTEXT_MNT|DEFCONTEXT_MNT))) -+ return 0; -+ - opts = kzalloc(sizeof(*opts), GFP_KERNEL); - if (!opts) - return -ENOMEM; - -- sbsec = selinux_superblock(reference); - if (sbsec->flags & FSCONTEXT_MNT) - opts->fscontext_sid = sbsec->sid; - if (sbsec->flags & CONTEXT_MNT) --- -2.41.0
[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: 2ee3cdde869666f49ee1b4aad3035e4bec2c8cb5 Author: Mike Pagano gentoo org> AuthorDate: Sat Sep 23 11:06:24 2023 + Commit: Mike Pagano gentoo org> CommitDate: Sat Sep 23 11:06:24 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=2ee3cdde Remove redundant patch Removed: 1515_selinux-fix-handling-of-empty-opts.patch Signed-off-by: Mike Pagano gentoo.org> _README | 4 1 file changed, 4 deletions(-) diff --git a/_README b/_README index a2ae7329..46cf8e96 100644 --- a/_README +++ b/_README @@ -71,10 +71,6 @@ Patch: 1510_fs-enable-link-security-restrictions-by-default.patch From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/ Desc: Enable link security restrictions by default. -Patch: 1515_selinux-fix-handling-of-empty-opts.patch -From: https://www.spinics.net/lists/linux-fsdevel/msg249428.html -Desc: selinux: fix handling of empty opts in selinux_fs_context_submount() - Patch: 1700_sparc-address-warray-bound-warnings.patch From: https://github.com/KSPP/linux/issues/109 Desc: Address -Warray-bounds warnings
[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: 0dd1f2b7dd1a6ae2aa7ae62e410e833431f14e39 Author: Mike Pagano gentoo org> AuthorDate: Fri Sep 15 17:55:05 2023 + Commit: Mike Pagano gentoo org> CommitDate: Fri Sep 15 17:55:05 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=0dd1f2b7 selinux: fix handling of empty opts in selinux_fs_context_submount() Bug: https://bugs.gentoo.org/914204 Signed-off-by: Mike Pagano gentoo.org> _README | 4 +++ 1515_selinux-fix-handling-of-empty-opts.patch | 51 +++ 2 files changed, 55 insertions(+) diff --git a/_README b/_README index 25625324..270cfbdf 100644 --- a/_README +++ b/_README @@ -63,6 +63,10 @@ Patch: 1510_fs-enable-link-security-restrictions-by-default.patch From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/ Desc: Enable link security restrictions by default. +Patch: 1515_selinux-fix-handling-of-empty-opts.patch +From: https://www.spinics.net/lists/linux-fsdevel/msg249428.html +Desc: selinux: fix handling of empty opts in selinux_fs_context_submount() + Patch: 1700_sparc-address-warray-bound-warnings.patch From: https://github.com/KSPP/linux/issues/109 Desc: Address -Warray-bounds warnings diff --git a/1515_selinux-fix-handling-of-empty-opts.patch b/1515_selinux-fix-handling-of-empty-opts.patch new file mode 100644 index ..10336ec5 --- /dev/null +++ b/1515_selinux-fix-handling-of-empty-opts.patch @@ -0,0 +1,51 @@ +selinux: fix handling of empty opts in selinux_fs_context_submount() + +selinux_set_mnt_opts() relies on the fact that the mount options pointer +is always NULL when all options are unset (specifically in its +!selinux_initialized() branch. However, the new +selinux_fs_context_submount() hook breaks this rule by allocating a new +structure even if no options are set. That causes any submount created +before a SELinux policy is loaded to be rejected in +selinux_set_mnt_opts(). + +Fix this by making selinux_fs_context_submount() leave fc->security +set to NULL when there are no options to be copied from the reference +superblock. + +Reported-by: Adam Williamson +Link: https://bugzilla.redhat.com/show_bug.cgi?id=2236345 +Fixes: d80a8f1b58c2 ("vfs, security: Fix automount superblock LSM init problem, preventing NFS sb sharing") +Signed-off-by: Ondrej Mosnacek +--- + security/selinux/hooks.c | 10 -- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c +index 10350534de6d6..2aa0e219d7217 100644 +--- a/security/selinux/hooks.c b/security/selinux/hooks.c +@@ -2775,14 +2775,20 @@ static int selinux_umount(struct vfsmount *mnt, int flags) + static int selinux_fs_context_submount(struct fs_context *fc, + struct super_block *reference) + { +- const struct superblock_security_struct *sbsec; ++ const struct superblock_security_struct *sbsec = selinux_superblock(reference); + struct selinux_mnt_opts *opts; + ++ /* ++ * Ensure that fc->security remains NULL when no options are set ++ * as expected by selinux_set_mnt_opts(). ++ */ ++ if (!(sbsec->flags & (FSCONTEXT_MNT|CONTEXT_MNT|DEFCONTEXT_MNT))) ++ return 0; ++ + opts = kzalloc(sizeof(*opts), GFP_KERNEL); + if (!opts) + return -ENOMEM; + +- sbsec = selinux_superblock(reference); + if (sbsec->flags & FSCONTEXT_MNT) + opts->fscontext_sid = sbsec->sid; + if (sbsec->flags & CONTEXT_MNT) +-- +2.41.0
[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: 8d3a7a27e859c54c74edab90803e9aedfc9681b0 Author: Mike Pagano gentoo org> AuthorDate: Wed Sep 13 12:07:36 2023 + Commit: Mike Pagano gentoo org> CommitDate: Wed Sep 13 12:07:36 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=8d3a7a27 Minor fix for BMQ Patch (Kconfig) Signed-off-by: Mike Pagano gentoo.org> _README | 2 +- 5020_BMQ-and-PDS-io-scheduler-v6.5-r0.patch | 647 ++-- 2 files changed, 317 insertions(+), 332 deletions(-) diff --git a/_README b/_README index de8216ab..25625324 100644 --- a/_README +++ b/_README @@ -100,5 +100,5 @@ From: https://github.com/graysky2/kernel_compiler_patch Desc: Kernel >= 5.15 patch enables gcc = v11.1+ optimizations for additional CPUs. Patch: 5020_BMQ-and-PDS-io-scheduler-v6.5-r0.patch -From: https://github.com/hhoffstaette/kernel-patches/ +From: https://gitlab.com/alfredchen/projectc Desc: BMQ(BitMap Queue) Scheduler. A new CPU scheduler developed from PDS(incld). Inspired by the scheduler in zircon. diff --git a/5020_BMQ-and-PDS-io-scheduler-v6.5-r0.patch b/5020_BMQ-and-PDS-io-scheduler-v6.5-r0.patch index f305f913..cb6b2d12 100644 --- a/5020_BMQ-and-PDS-io-scheduler-v6.5-r0.patch +++ b/5020_BMQ-and-PDS-io-scheduler-v6.5-r0.patch @@ -1,8 +1,5 @@ - -Thanks to torvic9 in https://gitlab.com/alfredchen/linux-prjc/-/issues/85 - diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 722b6ec..223e96f 100644 +index 23ebe34ff901..3fd78edff69c 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -5553,6 +5553,12 @@ @@ -19,7 +16,7 @@ index 722b6ec..223e96f 100644 schedstats= [KNL,X86] Enable or disable scheduled statistics. diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst -index 3800fab..12ea62d 100644 +index 3800fab1619b..12ea62da87e8 100644 --- a/Documentation/admin-guide/sysctl/kernel.rst +++ b/Documentation/admin-guide/sysctl/kernel.rst @@ -1616,3 +1616,13 @@ is 10 seconds. @@ -36,9 +33,9 @@ index 3800fab..12ea62d 100644 + 0 - No yield. + 1 - Deboost and requeue task. (default) + 2 - Set run queue skip task. -diff --git a/b/Documentation/scheduler/sched-BMQ.txt b/Documentation/scheduler/sched-BMQ.txt +diff --git a/Documentation/scheduler/sched-BMQ.txt b/Documentation/scheduler/sched-BMQ.txt new file mode 100644 -index 000..05c84ee +index ..05c84eec0f31 --- /dev/null +++ b/Documentation/scheduler/sched-BMQ.txt @@ -0,0 +1,110 @@ @@ -153,7 +150,7 @@ index 000..05c84ee +priority boost from unblocking while background threads that do most of the +processing receive the priority penalty for using their entire timeslice. diff --git a/fs/proc/base.c b/fs/proc/base.c -index 9df3f48..8a0596f 100644 +index 9df3f4839662..8a0596fbd14e 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -480,7 +480,7 @@ static int proc_pid_schedstat(struct seq_file *m, struct pid_namespace *ns, @@ -166,7 +163,7 @@ index 9df3f48..8a0596f 100644 task->sched_info.pcount); diff --git a/include/asm-generic/resource.h b/include/asm-generic/resource.h -index 8874f68..59eb72b 100644 +index 8874f681b056..59eb72bf7d5f 100644 --- a/include/asm-generic/resource.h +++ b/include/asm-generic/resource.h @@ -23,7 +23,7 @@ @@ -178,8 +175,81 @@ index 8874f68..59eb72b 100644 [RLIMIT_RTPRIO] = { 0, 0 }, \ [RLIMIT_RTTIME] = { RLIM_INFINITY, RLIM_INFINITY }, \ } +diff --git a/include/linux/sched.h b/include/linux/sched.h +index 609bde814cb0..bfdf715804a1 100644 +--- a/include/linux/sched.h b/include/linux/sched.h +@@ -763,8 +763,14 @@ struct task_struct { + unsigned intptrace; + + #ifdef CONFIG_SMP +- int on_cpu; + struct __call_single_node wake_entry; ++#endif ++#if defined(CONFIG_SMP) || defined(CONFIG_SCHED_ALT) ++ int on_cpu; ++#endif ++ ++#ifdef CONFIG_SMP ++#ifndef CONFIG_SCHED_ALT + unsigned intwakee_flips; + unsigned long wakee_flip_decay_ts; + struct task_struct *last_wakee; +@@ -778,6 +784,7 @@ struct task_struct { +*/ + int recent_used_cpu; + int wake_cpu; ++#endif /* !CONFIG_SCHED_ALT */ + #endif + int on_rq; + +@@ -786,6 +793,20 @@ struct task_struct { + int normal_prio; + unsigned intrt_priority; + ++#ifdef CONFIG_SCHED_ALT ++ u64 last_ran; ++ s64 time_slice; ++ int sq_idx; ++
[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: 9a88bbc80d292195f44fd0c75e13123e4e8eb02a Author: Mike Pagano gentoo org> AuthorDate: Wed Sep 6 22:14:09 2023 + Commit: Mike Pagano gentoo org> CommitDate: Wed Sep 6 22:14:09 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=9a88bbc8 Linux patch 6.5.2 Signed-off-by: Mike Pagano gentoo.org> _README|4 + 1001_linux-6.5.2.patch | 1052 2 files changed, 1056 insertions(+) diff --git a/_README b/_README index f7da0ce2..465e90aa 100644 --- a/_README +++ b/_README @@ -47,6 +47,10 @@ Patch: 1000_linux-6.5.1.patch From: https://www.kernel.org Desc: Linux 6.5.1 +Patch: 1001_linux-6.5.2.patch +From: https://www.kernel.org +Desc: Linux 6.5.2 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1001_linux-6.5.2.patch b/1001_linux-6.5.2.patch new file mode 100644 index ..82cc18a9 --- /dev/null +++ b/1001_linux-6.5.2.patch @@ -0,0 +1,1052 @@ +diff --git a/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt b/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt +index 0fa8e3e43bf80..1a7e4bff0456f 100644 +--- a/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt b/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt +@@ -23,6 +23,9 @@ Optional properties: + 1 = active low. + - irda-mode-ports: An array that lists the indices of the port that + should operate in IrDA mode. ++- nxp,modem-control-line-ports: An array that lists the indices of the port that ++ should have shared GPIO lines configured as ++ modem control lines. + + Example: + sc16is750: sc16is750@51 { +@@ -35,6 +38,26 @@ Example: + #gpio-cells = <2>; + }; + ++ sc16is752: sc16is752@53 { ++ compatible = "nxp,sc16is752"; ++ reg = <0x53>; ++ clocks = <>; ++ interrupt-parent = <>; ++ interrupts = <7 IRQ_TYPE_EDGE_FALLING>; ++ nxp,modem-control-line-ports = <1>; /* Port 1 as modem control lines */ ++ gpio-controller; /* Port 0 as GPIOs */ ++ #gpio-cells = <2>; ++ }; ++ ++ sc16is752: sc16is752@54 { ++ compatible = "nxp,sc16is752"; ++ reg = <0x54>; ++ clocks = <>; ++ interrupt-parent = <>; ++ interrupts = <7 IRQ_TYPE_EDGE_FALLING>; ++ nxp,modem-control-line-ports = <0 1>; /* Ports 0 and 1 as modem control lines */ ++ }; ++ + * spi as bus + + Required properties: +@@ -59,6 +82,9 @@ Optional properties: + 1 = active low. + - irda-mode-ports: An array that lists the indices of the port that + should operate in IrDA mode. ++- nxp,modem-control-line-ports: An array that lists the indices of the port that ++ should have shared GPIO lines configured as ++ modem control lines. + + Example: + sc16is750: sc16is750@0 { +@@ -70,3 +96,23 @@ Example: + gpio-controller; + #gpio-cells = <2>; + }; ++ ++ sc16is752: sc16is752@1 { ++ compatible = "nxp,sc16is752"; ++ reg = <1>; ++ clocks = <>; ++ interrupt-parent = <>; ++ interrupts = <7 IRQ_TYPE_EDGE_FALLING>; ++ nxp,modem-control-line-ports = <1>; /* Port 1 as modem control lines */ ++ gpio-controller; /* Port 0 as GPIOs */ ++ #gpio-cells = <2>; ++ }; ++ ++ sc16is752: sc16is752@2 { ++ compatible = "nxp,sc16is752"; ++ reg = <2>; ++ clocks = <>; ++ interrupt-parent = <>; ++ interrupts = <7 IRQ_TYPE_EDGE_FALLING>; ++ nxp,modem-control-line-ports = <0 1>; /* Ports 0 and 1 as modem control lines */ ++ }; +diff --git a/Makefile b/Makefile +index 062b9694e0547..c47558bc00aa8 100644 +--- a/Makefile b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 6 + PATCHLEVEL = 5 +-SUBLEVEL = 1 ++SUBLEVEL = 2 + EXTRAVERSION = + NAME = Hurr durr I'ma ninja sloth + +diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c +index d29bdcd5270e0..72fa2e3fd3531 100644 +--- a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c +@@ -216,8 +216,6 @@ void sharpsl_battery_kick(void) + { + schedule_delayed_work(_bat, msecs_to_jiffies(125)); + } +-EXPORT_SYMBOL(sharpsl_battery_kick); +- + + static void sharpsl_battery_thread(struct work_struct *private_) + { +diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c +index d01ea54b0b782..cc691b199429c 100644 +--- a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c +@@ -9,7 +9,6 @@ + */
[gentoo-commits] proj/linux-patches:6.5 commit in: /
commit: 85da7abb9dc4fd9a0f16d42dd530a7134eba7f67 Author: Mike Pagano gentoo org> AuthorDate: Sat Sep 2 09:53:56 2023 + Commit: Mike Pagano gentoo org> CommitDate: Sat Sep 2 09:53:56 2023 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=85da7abb Linux patch 6.5.1 Signed-off-by: Mike Pagano gentoo.org> _README| 4 + 1000_linux-6.5.1.patch | 489 + 2 files changed, 493 insertions(+) diff --git a/_README b/_README index 1efa027c..f7da0ce2 100644 --- a/_README +++ b/_README @@ -43,6 +43,10 @@ EXPERIMENTAL Individual Patch Descriptions: -- +Patch: 1000_linux-6.5.1.patch +From: https://www.kernel.org +Desc: Linux 6.5.1 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1000_linux-6.5.1.patch b/1000_linux-6.5.1.patch new file mode 100644 index ..0323b844 --- /dev/null +++ b/1000_linux-6.5.1.patch @@ -0,0 +1,489 @@ +diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt +index 722b6eca2e938..23ebe34ff901e 100644 +--- a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt +@@ -6275,10 +6275,6 @@ + -1: disable all critical trip points in all thermal zones + : override all critical trip points + +- thermal.nocrt= [HW,ACPI] +- Set to disable actions on ACPI thermal zone +- critical and hot trip points. +- + thermal.off=[HW,ACPI] + 1: disable ACPI thermal control + +diff --git a/Makefile b/Makefile +index 2fdd8b40b7e04..062b9694e0547 100644 +--- a/Makefile b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 6 + PATCHLEVEL = 5 +-SUBLEVEL = 0 ++SUBLEVEL = 1 + EXTRAVERSION = + NAME = Hurr durr I'ma ninja sloth + +diff --git a/arch/arm/kernel/module-plts.c b/arch/arm/kernel/module-plts.c +index f5a43fd8c1639..da2ee8d6ef1a7 100644 +--- a/arch/arm/kernel/module-plts.c b/arch/arm/kernel/module-plts.c +@@ -251,7 +251,7 @@ int module_frob_arch_sections(Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, + /* sort by type and symbol index */ + sort(rels, numrels, sizeof(Elf32_Rel), cmp_rel, NULL); + +- if (strncmp(secstrings + dstsec->sh_name, ".init", 5) != 0) ++ if (!module_init_layout_section(secstrings + dstsec->sh_name)) + core_plts += count_plts(syms, dstsec->sh_addr, rels, + numrels, s->sh_info); + else +diff --git a/arch/arm64/kernel/module-plts.c b/arch/arm64/kernel/module-plts.c +index ad02058756b50..bd69a4e7cd605 100644 +--- a/arch/arm64/kernel/module-plts.c b/arch/arm64/kernel/module-plts.c +@@ -339,7 +339,7 @@ int module_frob_arch_sections(Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, + if (nents) + sort(rels, nents, sizeof(Elf64_Rela), cmp_rela, NULL); + +- if (!str_has_prefix(secstrings + dstsec->sh_name, ".init")) ++ if (!module_init_layout_section(secstrings + dstsec->sh_name)) + core_plts += count_plts(syms, rels, numrels, + sechdrs[i].sh_info, dstsec); + else +diff --git a/arch/x86/include/asm/sections.h b/arch/x86/include/asm/sections.h +index a6e8373a5170f..3fa87e5e11aba 100644 +--- a/arch/x86/include/asm/sections.h b/arch/x86/include/asm/sections.h +@@ -2,8 +2,6 @@ + #ifndef _ASM_X86_SECTIONS_H + #define _ASM_X86_SECTIONS_H + +-#define arch_is_kernel_initmem_freed arch_is_kernel_initmem_freed +- + #include + #include + +@@ -18,20 +16,4 @@ extern char __end_of_kernel_reserve[]; + + extern unsigned long _brk_start, _brk_end; + +-static inline bool arch_is_kernel_initmem_freed(unsigned long addr) +-{ +- /* +- * If _brk_start has not been cleared, brk allocation is incomplete, +- * and we can not make assumptions about its use. +- */ +- if (_brk_start) +- return 0; +- +- /* +- * After brk allocation is complete, space between _brk_end and _end +- * is available for allocation. +- */ +- return addr >= _brk_end && addr < (unsigned long)&_end; +-} +- + #endif/* _ASM_X86_SECTIONS_H */ +diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c +index f9f6ebb08fdb7..3163a40f02e30 100644 +--- a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c +@@ -82,10 +82,6 @@ static int tzp; + module_param(tzp, int, 0444); + MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds."); + +-static int nocrt; +-module_param(nocrt, int, 0); +-MODULE_PARM_DESC(nocrt, "Set to