From 46bcc2276c5308d1ccc8a2aafae6656e299da0e5 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Wed, 12 Feb 2025 13:48:55 -0600
Subject: [PATCH] kernel v5.4.288-bone-rt-r68.1 rebase external git projects
and rt: v5.4.288-rt94 BBDTBS:
https://openbeagle.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/f72c40d59d211740c0970b0110d6f2cf53b96d16
RT: patch-5.4.288-rt94.patch.xz WIRELESS_REGDB:
https://git.kernel.org/pub/scm/linux/kernel/git/wens/wireless-regdb.git/commit/?id=f67f40d009199ee75c906f1ac898b38be981a7f7
BCFSERIAL:
https://openbeagle.org/beagleconnect/linux/bcfserial/-/commit/db467023bd136c97c2e13c3a8b9e41dbdfafbc66
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patch.sh | 81 +--
...-backports-bindeb-pkg-from-linux.git.patch | 8 +-
...0001-backports-wlcore-from-linux.git.patch | 26 +-
patches/defconfig | 42 +-
...-BeagleBoard.org-Device-Tree-Changes.patch | 136 ++--
...https-git.beagleboard.org-beagleconn.patch | 8 +-
patches/external/git/BBDTBS | 2 +-
patches/external/git/BCFSERIAL | 2 +-
patches/external/git/RT | 2 +-
patches/external/git/TI_AMX3_CM3 | 1 -
patches/external/git/WPANUSB | 2 +-
...01-merge-CONFIG_PREEMPT_RT-Patch-Set.patch | 679 ++++++++++--------
...-AM335x-CM3-Power-Managment-Firmware.patch | 4 +-
...tps-git.beagleboard.org-beagleconnec.patch | 8 +-
.../wpanusb/0002-Add-WPANUSB-driver.patch | 8 +-
...a-ahci-fix-enum-constants-for-gcc-13.patch | 369 ----------
patches/ref_omap2plus_defconfig | 13 +-
tools/config-hot-fix.sh | 134 +++-
version.sh | 6 +-
19 files changed, 614 insertions(+), 917 deletions(-)
rename patches/{soc/ti/beagleboard_dtbs => external/bbb.io}/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch (99%)
delete mode 100644 patches/external/git/TI_AMX3_CM3
rename patches/{drivers/ti/firmware => external/ti-amx3-cm3-pm-firmware}/0001-Add-AM335x-CM3-Power-Managment-Firmware.patch (99%)
delete mode 100644 patches/fixes/gcc/13/0001-ata-ahci-fix-enum-constants-for-gcc-13.patch
diff --git a/patch.sh b/patch.sh
index e0960cbb0..fa84c4434 100644
--- a/patch.sh
+++ b/patch.sh
@@ -111,7 +111,7 @@ wpanusb () {
rm -rf ./wpanusb || true
fi
- ${git_bin} clone https://git.beagleboard.org/beagleconnect/linux/wpanusb --depth=1
+ ${git_bin} clone https://openbeagle.org/beagleconnect/linux/wpanusb.git --depth=1
cd ./wpanusb
wpanusb_hash=$(git rev-parse HEAD)
cd -
@@ -122,9 +122,9 @@ wpanusb () {
cp -v ../wpanusb/wpanusb.c drivers/net/ieee802154/
${git_bin} add .
- ${git_bin} commit -a -m 'merge: wpanusb: https://git.beagleboard.org/beagleconnect/linux/wpanusb' -m "https://git.beagleboard.org/beagleconnect/linux/wpanusb/-/commit/${wpanusb_hash}" -s
+ ${git_bin} commit -a -m 'merge: wpanusb: https://git.beagleboard.org/beagleconnect/linux/wpanusb' -m "https://openbeagle.org/beagleconnect/linux/wpanusb/-/commit/${wpanusb_hash}" -s
${git_bin} format-patch -1 -o ../patches/external/wpanusb/
- echo "WPANUSB: https://git.beagleboard.org/beagleconnect/linux/wpanusb/-/commit/${wpanusb_hash}" > ../patches/external/git/WPANUSB
+ echo "WPANUSB: https://openbeagle.org/beagleconnect/linux/wpanusb/-/commit/${wpanusb_hash}" > ../patches/external/git/WPANUSB
rm -rf ../wpanusb/ || true
@@ -137,8 +137,6 @@ wpanusb () {
wdir="external/wpanusb"
number=1
cleanup
-
- exit 2
fi
dir 'external/wpanusb'
}
@@ -151,7 +149,7 @@ bcfserial () {
rm -rf ./bcfserial || true
fi
- ${git_bin} clone https://git.beagleboard.org/beagleconnect/linux/bcfserial.git --depth=1
+ ${git_bin} clone https://openbeagle.org/beagleconnect/linux/bcfserial.git --depth=1
cd ./bcfserial
bcfserial_hash=$(git rev-parse HEAD)
cd -
@@ -161,9 +159,9 @@ bcfserial () {
cp -v ../bcfserial/bcfserial.c drivers/net/ieee802154/
${git_bin} add .
- ${git_bin} commit -a -m 'merge: bcfserial: https://git.beagleboard.org/beagleconnect/linux/bcfserial.git' -m "https://git.beagleboard.org/beagleconnect/linux/bcfserial/-/commit/${bcfserial_hash}" -s
+ ${git_bin} commit -a -m 'merge: bcfserial: https://git.beagleboard.org/beagleconnect/linux/bcfserial.git' -m "https://openbeagle.org/beagleconnect/linux/bcfserial/-/commit/${bcfserial_hash}" -s
${git_bin} format-patch -1 -o ../patches/external/bcfserial/
- echo "BCFSERIAL: https://git.beagleboard.org/beagleconnect/linux/bcfserial/-/commit/${bcfserial_hash}" > ../patches/external/git/BCFSERIAL
+ echo "BCFSERIAL: https://openbeagle.org/beagleconnect/linux/bcfserial/-/commit/${bcfserial_hash}" > ../patches/external/git/BCFSERIAL
rm -rf ../bcfserial/ || true
@@ -176,8 +174,6 @@ bcfserial () {
wdir="external/bcfserial"
number=1
cleanup
-
- exit 2
fi
dir 'external/bcfserial'
}
@@ -251,45 +247,6 @@ wireless_regdb () {
dir 'external/wireless_regdb'
}
-ti_pm_firmware () {
- #https://git.ti.com/gitweb?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=shortlog;h=refs/heads/ti-v4.1.y
- #regenerate="enable"
- if [ "x${regenerate}" = "xenable" ] ; then
- cd ../
- if [ -d ./ti-amx3-cm3-pm-firmware ] ; then
- rm -rf ./ti-amx3-cm3-pm-firmware || true
- fi
-
- ${git_bin} clone -b ti-v4.1.y git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git --depth=1
- cd ./ti-amx3-cm3-pm-firmware
- ti_amx3_cm3_hash=$(git rev-parse HEAD)
- cd -
-
- cd ./KERNEL/
-
- mkdir -p ./firmware/ || true
- cp -v ../ti-amx3-cm3-pm-firmware/bin/am* ./firmware/
-
- ${git_bin} add -f ./firmware/am*
- ${git_bin} commit -a -m 'Add AM335x CM3 Power Managment Firmware' -m "http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=${ti_amx3_cm3_hash}" -s
- ${git_bin} format-patch -1 -o ../patches/drivers/ti/firmware/
- echo "TI_AMX3_CM3: http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=${ti_amx3_cm3_hash}" > ../patches/external/git/TI_AMX3_CM3
-
- rm -rf ../ti-amx3-cm3-pm-firmware/ || true
-
- ${git_bin} reset --hard HEAD^
-
- start_cleanup
-
- ${git} "${DIR}/patches/drivers/ti/firmware/0001-Add-AM335x-CM3-Power-Managment-Firmware.patch"
-
- wdir="drivers/ti/firmware"
- number=1
- cleanup
- fi
- dir 'drivers/ti/firmware'
-}
-
cleanup_dts_builds () {
rm -rf arch/arm/boot/dts/modules.order || true
rm -rf arch/arm/boot/dts/.*cmd || true
@@ -351,9 +308,9 @@ beagleboard_dtbs () {
${git_bin} add -f arch/arm/boot/dts/
${git_bin} add -f include/dt-bindings/
- ${git_bin} commit -a -m "Add BeagleBoard.org Device Tree Changes" -m "https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/tree/${branch}" -m "https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/${git_hash}" -s
- ${git_bin} format-patch -1 -o ../patches/soc/ti/beagleboard_dtbs/
- echo "BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/${git_hash}" > ../patches/external/git/BBDTBS
+ ${git_bin} commit -a -m "Add BeagleBoard.org Device Tree Changes" -m "https://openbeagle.org/beagleboard/BeagleBoard-DeviceTrees/-/tree/${branch}" -m "https://openbeagle.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/${git_hash}" -s
+ ${git_bin} format-patch -1 -o ../patches/external/bbb.io/
+ echo "BBDTBS: https://openbeagle.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/${git_hash}" > ../patches/external/git/BBDTBS
rm -rf ../${work_dir}/ || true
@@ -361,13 +318,13 @@ beagleboard_dtbs () {
start_cleanup
- ${git} "${DIR}/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch"
+ ${git} "${DIR}/patches/external/bbb.io/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch"
- wdir="soc/ti/beagleboard_dtbs"
+ wdir="external/bbb.io"
number=1
cleanup
fi
- dir 'soc/ti/beagleboard_dtbs'
+ dir 'external/bbb.io'
}
local_patch () {
@@ -380,7 +337,6 @@ wpanusb
bcfserial
rt
wireless_regdb
-ti_pm_firmware
beagleboard_dtbs
#local_patch
@@ -401,17 +357,17 @@ pre_backports () {
post_backports () {
if [ ! "x${backport_tag}" = "x" ] ; then
cd ~/linux-src/
- ${git_bin} checkout master -f ; ${git_bin} branch -D tmp
+ ${git_bin} checkout master -f
cd -
fi
- rm -f arch/arm/boot/dts/overlays/*.dtbo || true
${git_bin} add .
${git_bin} commit -a -m "backports: ${subsystem}: from: linux.git" -m "Reference: ${backport_tag}" -s
if [ ! -d ../patches/backports/${subsystem}/ ] ; then
mkdir -p ../patches/backports/${subsystem}/
fi
${git_bin} format-patch -1 -o ../patches/backports/${subsystem}/
+ exit 2
}
patch_backports () {
@@ -430,7 +386,6 @@ backports () {
cp -rv ~/linux-src/drivers/net/wireless/ti/* ./drivers/net/wireless/ti/
post_backports
- exit 2
else
patch_backports
fi
@@ -662,11 +617,10 @@ drivers () {
# dir 'drivers/ti/mmc'
dir 'drivers/greybus'
dir 'drivers/bluetooth'
-}
-fixes () {
dir 'fixes/gcc'
- dir 'fixes/gcc/13'
+
+ dir 'external/ti-amx3-cm3-pm-firmware'
}
###
@@ -674,13 +628,12 @@ backports
brcmfmac
reverts
drivers
-fixes
packaging () {
echo "Update: package scripts"
do_backport="enable"
if [ "x${do_backport}" = "xenable" ] ; then
- backport_tag="v5.10.200"
+ backport_tag="v5.10.234"
subsystem="bindeb-pkg"
#regenerate="enable"
diff --git a/patches/backports/bindeb-pkg/0001-backports-bindeb-pkg-from-linux.git.patch b/patches/backports/bindeb-pkg/0001-backports-bindeb-pkg-from-linux.git.patch
index d47252c86..16b032709 100644
--- a/patches/backports/bindeb-pkg/0001-backports-bindeb-pkg-from-linux.git.patch
+++ b/patches/backports/bindeb-pkg/0001-backports-bindeb-pkg-from-linux.git.patch
@@ -1,9 +1,9 @@
-From 731fa1a584de8eed7c8ad3b367e9ae65cb86d146 Mon Sep 17 00:00:00 2001
+From 5d954606ccb2d81935ad6b30802b34dab73f0a44 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 10:23:20 -0500
+Date: Wed, 12 Feb 2025 13:45:00 -0600
Subject: [PATCH] backports: bindeb-pkg: from: linux.git
-Reference: v5.10.179
+Reference: v5.10.234
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
scripts/package/builddeb | 119 ++++++++++++++++++++++++---------------
@@ -376,5 +376,5 @@ index 8640c278f1aa..951cc60e5a90 100755
$M $MAKE %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} modules_install
$MAKE %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
--
-2.39.2
+2.47.2
diff --git a/patches/backports/wlcore/0001-backports-wlcore-from-linux.git.patch b/patches/backports/wlcore/0001-backports-wlcore-from-linux.git.patch
index a7f1d8b9f..872f97ec7 100644
--- a/patches/backports/wlcore/0001-backports-wlcore-from-linux.git.patch
+++ b/patches/backports/wlcore/0001-backports-wlcore-from-linux.git.patch
@@ -1,6 +1,6 @@
-From 5b4075a4dbae7ef06ea211893c4fcfaa6dfbc974 Mon Sep 17 00:00:00 2001
+From e131f619331510e93a16fe436f7e732fe2ffb99a Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 17 Nov 2023 16:03:55 -0600
+Date: Wed, 12 Feb 2025 13:42:22 -0600
Subject: [PATCH] backports: wlcore: from: linux.git
Reference: v5.13.19
@@ -15,7 +15,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
drivers/net/wireless/ti/wl1251/reg.h | 2 +-
drivers/net/wireless/ti/wl1251/sdio.c | 39 ++---
drivers/net/wireless/ti/wl1251/wl12xx_80211.h | 2 +-
- drivers/net/wireless/ti/wl12xx/Kconfig | 8 +-
+ drivers/net/wireless/ti/wl12xx/Kconfig | 2 +-
drivers/net/wireless/ti/wl12xx/reg.h | 2 +-
drivers/net/wireless/ti/wl18xx/Kconfig | 2 +-
drivers/net/wireless/ti/wlcore/Kconfig | 6 +-
@@ -33,7 +33,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
drivers/net/wireless/ti/wlcore/sysfs.c | 2 +-
drivers/net/wireless/ti/wlcore/wl12xx_80211.h | 2 +-
drivers/net/wireless/ti/wlcore/wlcore_i.h | 1 +
- 27 files changed, 150 insertions(+), 189 deletions(-)
+ 27 files changed, 147 insertions(+), 186 deletions(-)
diff --git a/drivers/net/wireless/ti/Kconfig b/drivers/net/wireless/ti/Kconfig
index b81f2e41a63a..7c0b17a76fe2 100644
@@ -344,24 +344,18 @@ index 7fabe702c4cc..7e28fe435b43 100644
struct wl12xx_ie_header {
diff --git a/drivers/net/wireless/ti/wl12xx/Kconfig b/drivers/net/wireless/ti/wl12xx/Kconfig
-index e409042ee9a0..786fff288505 100644
+index 9c4511604b67..786fff288505 100644
--- a/drivers/net/wireless/ti/wl12xx/Kconfig
+++ b/drivers/net/wireless/ti/wl12xx/Kconfig
-@@ -1,10 +1,10 @@
- # SPDX-License-Identifier: GPL-2.0-only
- config WL12XX
-- tristate "TI wl12xx support"
-+ tristate "TI wl12xx support"
+@@ -3,7 +3,7 @@ config WL12XX
+ tristate "TI wl12xx support"
depends on MAC80211
-- select WLCORE
-- ---help---
-+ select WLCORE
+ select WLCORE
+- ---help---
+ help
This module adds support for wireless adapters based on TI wl1271,
wl1273, wl1281 and wl1283 chipsets. This module does *not* include
support for wl1251. For wl1251 support, use the separate homonymous
-- driver instead.
-+ driver instead.
diff --git a/drivers/net/wireless/ti/wl12xx/reg.h b/drivers/net/wireless/ti/wl12xx/reg.h
index 247f558ba630..8ff018808020 100644
--- a/drivers/net/wireless/ti/wl12xx/reg.h
@@ -1125,5 +1119,5 @@ index 6fab60b0e367..eefae3f867b9 100644
enum wl12xx_flags {
--
-2.39.2
+2.47.2
diff --git a/patches/defconfig b/patches/defconfig
index 8210cb39c..827b0be3b 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.257 Kernel Configuration
+# Linux/arm 5.4.288 Kernel Configuration
#
#
@@ -29,8 +29,8 @@ CONFIG_HAVE_KERNEL_LZO=y
CONFIG_HAVE_KERNEL_LZ4=y
# CONFIG_KERNEL_GZIP is not set
# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-CONFIG_KERNEL_LZO=y
+CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_LZO is not set
# CONFIG_KERNEL_LZ4 is not set
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SWAP=y
@@ -483,7 +483,6 @@ CONFIG_SECCOMP=y
# CONFIG_PARAVIRT is not set
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
# CONFIG_XEN is not set
-CONFIG_STACKPROTECTOR_PER_TASK=y
# end of Kernel Features
#
@@ -726,11 +725,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
CONFIG_PLUGIN_HOSTCC="g++"
CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
-CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y
+# CONFIG_GCC_PLUGINS is not set
# end of General architecture-dependent options
CONFIG_RT_MUTEXES=y
@@ -904,7 +899,7 @@ CONFIG_IP_PNP_BOOTP=y
CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IP_TUNNEL=y
CONFIG_NET_IPGRE=m
CONFIG_NET_IPGRE_BROADCAST=y
CONFIG_IP_MROUTE_COMMON=y
@@ -914,7 +909,7 @@ CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_UDP_TUNNEL=y
CONFIG_NET_FOU=m
CONFIG_NET_FOU_IP_TUNNELS=y
CONFIG_INET_AH=m
@@ -1424,10 +1419,8 @@ CONFIG_NET_SCHED=y
#
# Queueing/Scheduling
#
-CONFIG_NET_SCH_CBQ=m
CONFIG_NET_SCH_HTB=m
CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
CONFIG_NET_SCH_PRIO=m
CONFIG_NET_SCH_MULTIQ=m
CONFIG_NET_SCH_RED=m
@@ -1439,7 +1432,6 @@ CONFIG_NET_SCH_CBS=m
CONFIG_NET_SCH_ETF=m
# CONFIG_NET_SCH_TAPRIO is not set
CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
CONFIG_NET_SCH_NETEM=m
CONFIG_NET_SCH_DRR=m
CONFIG_NET_SCH_MQPRIO=m
@@ -1467,7 +1459,7 @@ CONFIG_NET_CLS_U32=m
CONFIG_CLS_U32_PERF=y
CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_CGROUP=y
CONFIG_NET_CLS_BPF=m
CONFIG_NET_CLS_FLOWER=m
CONFIG_NET_CLS_MATCHALL=m
@@ -1692,7 +1684,6 @@ CONFIG_WIRELESS=y
CONFIG_WIRELESS_EXT=y
CONFIG_WEXT_CORE=y
CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
CONFIG_WEXT_PRIV=y
CONFIG_CFG80211=m
# CONFIG_NL80211_TESTMODE is not set
@@ -1794,7 +1785,7 @@ CONFIG_EXTRA_FIRMWARE="regulatory.db regulatory.db.p7s am335x-pm-firmware.elf am
CONFIG_EXTRA_FIRMWARE_DIR="firmware"
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# end of Firmware loader
CONFIG_WANT_DEV_COREDUMP=y
@@ -2211,7 +2202,7 @@ CONFIG_NETDEVICES=y
CONFIG_MII=y
CONFIG_NET_CORE=y
CONFIG_BONDING=m
-CONFIG_DUMMY=m
+CONFIG_DUMMY=y
CONFIG_EQUALIZER=m
CONFIG_IFB=m
CONFIG_NET_TEAM=m
@@ -2223,9 +2214,9 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
+CONFIG_IPVLAN=y
CONFIG_IPVTAP=m
-CONFIG_VXLAN=m
+CONFIG_VXLAN=y
CONFIG_GENEVE=m
CONFIG_GTP=m
CONFIG_MACSEC=m
@@ -3157,7 +3148,7 @@ CONFIG_GPIO_XRA1403=m
# end of USB GPIO expanders
# CONFIG_GPIO_MOCKUP is not set
-CONFIG_W1=m
+CONFIG_W1=y
CONFIG_W1_CON=y
#
@@ -5052,8 +5043,7 @@ CONFIG_USB_MUSB_AM335X_CHILD=y
#
# MUSB DMA mode
#
-# CONFIG_MUSB_PIO_ONLY is not set
-CONFIG_USB_TI_CPPI41_DMA=y
+CONFIG_MUSB_PIO_ONLY=y
# CONFIG_USB_DWC3 is not set
# CONFIG_USB_DWC2 is not set
# CONFIG_USB_CHIPIDEA is not set
@@ -6799,6 +6789,9 @@ CONFIG_KEYS=y
# CONFIG_ENCRYPTED_KEYS is not set
CONFIG_KEY_DH_OPERATIONS=y
# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_PROC_MEM_ALWAYS_FORCE=y
+# CONFIG_PROC_MEM_FORCE_PTRACE is not set
+# CONFIG_PROC_MEM_NO_FORCE is not set
CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
CONFIG_SECURITY_NETWORK=y
@@ -6854,9 +6847,6 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tom
# Memory initialization
#
CONFIG_INIT_STACK_NONE=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
# end of Memory initialization
diff --git a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch b/patches/external/bbb.io/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch
similarity index 99%
rename from patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch
rename to patches/external/bbb.io/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch
index c84383fe0..0703ea82d 100644
--- a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch
+++ b/patches/external/bbb.io/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch
@@ -1,11 +1,11 @@
-From e2740e215752548cec2b1d1dcb64c98a4141640d Mon Sep 17 00:00:00 2001
+From c49e7c6511646b18928c40b2e1c02b1bac197d8b Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 17 Nov 2023 16:01:44 -0600
+Date: Wed, 12 Feb 2025 13:39:35 -0600
Subject: [PATCH] Add BeagleBoard.org Device Tree Changes
-https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/tree/v5.4.x
+https://openbeagle.org/beagleboard/BeagleBoard-DeviceTrees/-/tree/v5.4.x
-https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/f72c40d59d211740c0970b0110d6f2cf53b96d16
+https://openbeagle.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/f72c40d59d211740c0970b0110d6f2cf53b96d16
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
arch/arm/boot/dts/Makefile | 10 +
@@ -16,17 +16,17 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/am335x-bone-jtag.dtsi | 15 +
arch/arm/boot/dts/am335x-bone-uboot-univ.dts | 29 +
arch/arm/boot/dts/am335x-bone.dts | 7 +-
- .../arm/boot/dts/am335x-boneblack-common.dtsi | 6 +-
+ .../arm/boot/dts/am335x-boneblack-common.dtsi | 7 +-
.../boot/dts/am335x-boneblack-uboot-univ.dts | 184 ++
arch/arm/boot/dts/am335x-boneblack-uboot.dts | 192 ++
- .../boot/dts/am335x-boneblack-wireless.dts | 10 +-
+ .../boot/dts/am335x-boneblack-wireless.dts | 9 +-
arch/arm/boot/dts/am335x-boneblack.dts | 151 +-
- arch/arm/boot/dts/am335x-boneblue.dts | 574 +++-
+ arch/arm/boot/dts/am335x-boneblue.dts | 573 +++-
.../arm/boot/dts/am335x-bonegreen-common.dtsi | 3 +-
.../arm/boot/dts/am335x-bonegreen-gateway.dts | 258 ++
...am335x-bonegreen-wireless-common-univ.dtsi | 2783 ++++++++++++++++
.../am335x-bonegreen-wireless-uboot-univ.dts | 56 +
- .../boot/dts/am335x-bonegreen-wireless.dts | 12 +-
+ .../boot/dts/am335x-bonegreen-wireless.dts | 11 +-
arch/arm/boot/dts/am335x-bonegreen.dts | 7 +-
arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 41 +-
arch/arm/boot/dts/am335x-osd335x-common.dtsi | 3 +-
@@ -34,8 +34,8 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
.../dts/am335x-sancloud-bbe-uboot-univ.dts | 152 +
.../boot/dts/am335x-sancloud-bbe-uboot.dts | 151 +
arch/arm/boot/dts/am335x-sancloud-bbe.dts | 11 +-
- arch/arm/boot/dts/am33xx-l4.dtsi | 204 +-
- arch/arm/boot/dts/am33xx.dtsi | 7 +-
+ arch/arm/boot/dts/am33xx-l4.dtsi | 198 +-
+ arch/arm/boot/dts/am33xx.dtsi | 4 +-
arch/arm/boot/dts/am5728.dtsi | 2 +-
arch/arm/boot/dts/am5729-beagleboneai.dts | 754 +++++
.../boot/dts/am57xx-beagle-x15-common.dtsi | 12 +-
@@ -102,7 +102,8 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
include/dt-bindings/clock/dra7.h | 28 +
include/dt-bindings/clock/omap4.h | 11 +
include/dt-bindings/clock/omap5.h | 18 +
- 94 files changed, 14298 insertions(+), 244 deletions(-)
+ include/uapi/linux/input-event-codes.h | 1 -
+ 95 files changed, 14291 insertions(+), 241 deletions(-)
create mode 100644 arch/arm/boot/dts/am335x-abbbi.dts
create mode 100644 arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
create mode 100644 arch/arm/boot/dts/am335x-bone-common-univ.dtsi
@@ -3954,7 +3955,7 @@ index 43bfbce41049..ea138cb34091 100644
&ldo3_reg {
diff --git a/arch/arm/boot/dts/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
-index dd932220a8bf..9659835d5874 100644
+index 91f93bc89716..9659835d5874 100644
--- a/arch/arm/boot/dts/am335x-boneblack-common.dtsi
+++ b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
@@ -1,6 +1,6 @@
@@ -3965,7 +3966,13 @@ index dd932220a8bf..9659835d5874 100644
*/
#include <dt-bindings/display/tda998x.h>
-@@ -28,7 +28,7 @@
+@@ -22,12 +22,13 @@
+ pinctrl-0 = <&emmc_pins>;
+ bus-width = <8>;
+ status = "okay";
++ non-removable;
+ };
+
&am33xx_pinmux {
nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
pinctrl-single,pins = <
@@ -3974,7 +3981,7 @@ index dd932220a8bf..9659835d5874 100644
AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_LCD_DATA1, PIN_OUTPUT, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_LCD_DATA2, PIN_OUTPUT, MUX_MODE0)
-@@ -54,7 +54,7 @@
+@@ -53,7 +54,7 @@
nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins {
pinctrl-single,pins = <
@@ -4372,7 +4379,7 @@ index 000000000000..0129f95c42a6
+ "NC";
+};
diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-index e07dd7979586..c34d2ed654d0 100644
+index 3124d94c0b3c..c34d2ed654d0 100644
--- a/arch/arm/boot/dts/am335x-boneblack-wireless.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
@@ -1,6 +1,6 @@
@@ -4395,15 +4402,7 @@ index e07dd7979586..c34d2ed654d0 100644
wlan_en_reg: fixedregulator@2 {
compatible = "regulator-fixed";
regulator-name = "wlan-en-regulator";
-@@ -75,6 +80,7 @@
- bus-width = <4>;
- non-removable;
- cap-power-off-card;
-+ ti,needs-special-hs-handling;
- keep-power-in-suspend;
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
-@@ -101,7 +107,7 @@
+@@ -102,7 +107,7 @@
};
&gpio3 {
@@ -4585,7 +4584,7 @@ index d3928662aed4..cb9cee378870 100644
+ "NC";
+};
diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
-index 30b62de86b5b..fd06db61ded6 100644
+index 2f6652ef9a15..fd06db61ded6 100644
--- a/arch/arm/boot/dts/am335x-boneblue.dts
+++ b/arch/arm/boot/dts/am335x-boneblue.dts
@@ -1,6 +1,6 @@
@@ -4858,15 +4857,7 @@ index 30b62de86b5b..fd06db61ded6 100644
&uart5 {
pinctrl-names = "default";
-@@ -389,6 +585,7 @@
- bus-width = <4>;
- non-removable;
- cap-power-off-card;
-+ ti,needs-special-hs-handling;
- keep-power-in-suspend;
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
-@@ -403,12 +600,12 @@
+@@ -404,12 +600,12 @@
};
};
@@ -4885,7 +4876,7 @@ index 30b62de86b5b..fd06db61ded6 100644
&uart3 {
pinctrl-names = "default";
-@@ -427,17 +624,352 @@
+@@ -428,17 +624,352 @@
clock-names = "ext-clk", "int-clk";
};
@@ -8376,7 +8367,7 @@ index 000000000000..02fbbe9ece34
+ };
+};
diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-index 609c8db687ec..d3392ea422b0 100644
+index 4092cd193b8a..d3392ea422b0 100644
--- a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
+++ b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
@@ -1,6 +1,6 @@
@@ -8399,15 +8390,7 @@ index 609c8db687ec..d3392ea422b0 100644
wlan_en_reg: fixedregulator@2 {
compatible = "regulator-fixed";
regulator-name = "wlan-en-regulator";
-@@ -75,6 +80,7 @@
- bus-width = <4>;
- non-removable;
- cap-power-off-card;
-+ ti,needs-special-hs-handling;
- keep-power-in-suspend;
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
-@@ -101,7 +107,7 @@
+@@ -102,7 +107,7 @@
};
&gpio1 {
@@ -8416,7 +8399,7 @@ index 609c8db687ec..d3392ea422b0 100644
gpio-hog;
gpios = <29 GPIO_ACTIVE_HIGH>;
output-high;
-@@ -118,7 +124,7 @@
+@@ -119,7 +124,7 @@
/* an external pulldown on U21 pin 4. */
&gpio3 {
@@ -11240,7 +11223,7 @@ index e5fdb7abb0d5..9bb56d58ac50 100644
reg = <0x68>;
interrupt-parent = <&gpio0>;
diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
-index cacd564b4d28..60d2d0990ea2 100644
+index 8ec6c4500fd5..60d2d0990ea2 100644
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -158,6 +158,39 @@
@@ -11393,22 +11376,17 @@ index cacd564b4d28..60d2d0990ea2 100644
};
};
-@@ -1333,9 +1399,12 @@
- ranges = <0x0 0x60000 0x1000>;
-
- mmc1: mmc@0 {
-- compatible = "ti,am335-sdhci";
-+ compatible = "ti,omap4-hsmmc";
-+ ti,dual-volt;
+@@ -1337,7 +1403,8 @@
+ ti,dual-volt;
ti,needs-special-reset;
+ ti,needs-special-hs-handling;
- dmas = <&edma 24 0>, <&edma 25 0>;
-+ ti,needs-special-hs-handling;
+ dmas = <&edma_xbar 24 0 0
+ &edma_xbar 25 0 0>;
dma-names = "tx", "rx";
interrupts = <64>;
reg = <0x0 0x1000>;
-@@ -1708,6 +1777,39 @@
+@@ -1710,6 +1777,39 @@
#interrupt-cells = <2>;
reg = <0x0 0x1000>;
interrupts = <32>;
@@ -11448,7 +11426,7 @@ index cacd564b4d28..60d2d0990ea2 100644
};
};
-@@ -1742,6 +1844,39 @@
+@@ -1744,6 +1844,39 @@
#interrupt-cells = <2>;
reg = <0x0 0x1000>;
interrupts = <62>;
@@ -11488,16 +11466,7 @@ index cacd564b4d28..60d2d0990ea2 100644
};
};
-@@ -1824,7 +1959,7 @@
- ranges = <0x0 0xd8000 0x1000>;
-
- mmc2: mmc@0 {
-- compatible = "ti,am335-sdhci";
-+ compatible = "ti,omap4-hsmmc";
- ti,needs-special-reset;
- dmas = <&edma 2 0
- &edma 3 0>;
-@@ -1911,6 +2046,15 @@
+@@ -1913,6 +2046,15 @@
status = "disabled";
};
@@ -11513,7 +11482,7 @@ index cacd564b4d28..60d2d0990ea2 100644
ehrpwm0: pwm@200 {
compatible = "ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
-@@ -1964,6 +2108,15 @@
+@@ -1966,6 +2108,15 @@
status = "disabled";
};
@@ -11529,7 +11498,7 @@ index cacd564b4d28..60d2d0990ea2 100644
ehrpwm1: pwm@200 {
compatible = "ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
-@@ -2017,6 +2170,15 @@
+@@ -2019,6 +2170,15 @@
status = "disabled";
};
@@ -11546,7 +11515,7 @@ index cacd564b4d28..60d2d0990ea2 100644
compatible = "ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index efe36f395bdd..97cd2555e2e8 100644
+index 77fa7c0f2104..97cd2555e2e8 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -1,7 +1,7 @@
@@ -11567,19 +11536,6 @@ index efe36f395bdd..97cd2555e2e8 100644
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
-@@ -259,11 +259,10 @@
- ranges = <0x0 0x47810000 0x1000>;
-
- mmc3: mmc@0 {
-- compatible = "ti,am335-sdhci";
-+ compatible = "ti,omap4-hsmmc";
- ti,needs-special-reset;
- interrupts = <29>;
- reg = <0x0 0x1000>;
-- status = "disabled";
- };
- };
-
diff --git a/arch/arm/boot/dts/am5728.dtsi b/arch/arm/boot/dts/am5728.dtsi
index 82e5427ef6a9..6dfd62599b2f 100644
--- a/arch/arm/boot/dts/am5728.dtsi
@@ -16515,6 +16471,18 @@ index e5411938983c..90e0d4b00127 100644
/* dss clocks */
#define OMAP5_DSS_CORE_CLKCTRL OMAP5_CLKCTRL_INDEX(0x20)
+diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
+index bf6c2f0b26fd..7f0ae1f411e3 100644
+--- a/include/uapi/linux/input-event-codes.h
++++ b/include/uapi/linux/input-event-codes.h
+@@ -598,7 +598,6 @@
+
+ #define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */
+ #define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */
+-#define KEY_REFRESH_RATE_TOGGLE 0x232 /* Display refresh rate toggle */
+
+ #define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */
+ #define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */
--
-2.39.2
+2.47.2
diff --git a/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch b/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch
index 4a3daae16..2031bbf59 100644
--- a/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch
+++ b/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch
@@ -1,10 +1,10 @@
-From ac2021a045505fc8bc85a7a01f7c71e333be6fa8 Mon Sep 17 00:00:00 2001
+From 0adb19e0aff27bbb524e1217adadfe3d9612251c Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 17 Nov 2023 15:58:47 -0600
+Date: Wed, 12 Feb 2025 13:37:09 -0600
Subject: [PATCH] merge: bcfserial:
https://git.beagleboard.org/beagleconnect/linux/bcfserial.git
-https://git.beagleboard.org/beagleconnect/linux/bcfserial/-/commit/db467023bd136c97c2e13c3a8b9e41dbdfafbc66
+https://openbeagle.org/beagleconnect/linux/bcfserial/-/commit/db467023bd136c97c2e13c3a8b9e41dbdfafbc66
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
drivers/net/ieee802154/bcfserial.c | 680 +++++++++++++++++++++++++++++
@@ -698,5 +698,5 @@ index 000000000000..11a456e56887
+MODULE_VERSION("0.1.1");
+MODULE_LICENSE("GPL v2");
--
-2.39.2
+2.47.2
diff --git a/patches/external/git/BBDTBS b/patches/external/git/BBDTBS
index 34da8b6a2..1f0cfa91b 100644
--- a/patches/external/git/BBDTBS
+++ b/patches/external/git/BBDTBS
@@ -1 +1 @@
-BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/f72c40d59d211740c0970b0110d6f2cf53b96d16
+BBDTBS: https://openbeagle.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/f72c40d59d211740c0970b0110d6f2cf53b96d16
diff --git a/patches/external/git/BCFSERIAL b/patches/external/git/BCFSERIAL
index b6f1e46ac..48b7059c2 100644
--- a/patches/external/git/BCFSERIAL
+++ b/patches/external/git/BCFSERIAL
@@ -1 +1 @@
-BCFSERIAL: https://git.beagleboard.org/beagleconnect/linux/bcfserial/-/commit/db467023bd136c97c2e13c3a8b9e41dbdfafbc66
+BCFSERIAL: https://openbeagle.org/beagleconnect/linux/bcfserial/-/commit/db467023bd136c97c2e13c3a8b9e41dbdfafbc66
diff --git a/patches/external/git/RT b/patches/external/git/RT
index 422f74259..90f85ae38 100644
--- a/patches/external/git/RT
+++ b/patches/external/git/RT
@@ -1 +1 @@
-RT: patch-5.4.257-rt87.patch.xz
+RT: patch-5.4.288-rt94.patch.xz
diff --git a/patches/external/git/TI_AMX3_CM3 b/patches/external/git/TI_AMX3_CM3
deleted file mode 100644
index 4a3e66640..000000000
--- a/patches/external/git/TI_AMX3_CM3
+++ /dev/null
@@ -1 +0,0 @@
-TI_AMX3_CM3: http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=fb484c5e54f2e31cf0a338d2927a06a2870bcc2c
diff --git a/patches/external/git/WPANUSB b/patches/external/git/WPANUSB
index 9c86d1e3c..9a588fc7c 100644
--- a/patches/external/git/WPANUSB
+++ b/patches/external/git/WPANUSB
@@ -1 +1 @@
-WPANUSB: https://git.beagleboard.org/beagleconnect/linux/wpanusb/-/commit/6aa9bf65b9d88a2c9a111e7b4aed03de2be9413d
+WPANUSB: https://openbeagle.org/beagleconnect/linux/wpanusb/-/commit/6aa9bf65b9d88a2c9a111e7b4aed03de2be9413d
diff --git a/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch b/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch
index 8fab2e02e..e901ea84b 100644
--- a/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch
+++ b/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch
@@ -1,9 +1,9 @@
-From 87a236cc38588efdabe36b6f1cac39c2817477bd Mon Sep 17 00:00:00 2001
+From 00ca142dc92d2b888b54c976fc12c8c3d72021d3 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 17 Nov 2023 16:07:41 -0600
+Date: Wed, 12 Feb 2025 13:39:02 -0600
Subject: [PATCH] merge: CONFIG_PREEMPT_RT Patch Set
-patch-5.4.257-rt87.patch.xz
+patch-5.4.288-rt94.patch.xz
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
@@ -254,7 +254,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
include/linux/percpu.h | 29 +
include/linux/pid.h | 1 +
include/linux/posix-timers.h | 11 +
- include/linux/preempt.h | 109 +-
+ include/linux/preempt.h | 139 +-
include/linux/printk.h | 44 +-
include/linux/printk_ringbuffer.h | 114 +
include/linux/radix-tree.h | 6 +-
@@ -336,7 +336,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
kernel/panic.c | 5 +-
kernel/printk/Makefile | 1 -
kernel/printk/internal.h | 72 -
- kernel/printk/printk.c | 1915 ++++++++---------
+ kernel/printk/printk.c | 1919 ++++++++---------
kernel/printk/printk_safe.c | 414 ----
kernel/ptrace.c | 32 +-
kernel/rcu/Kconfig | 8 +-
@@ -418,7 +418,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
security/apparmor/lsm.c | 2 +-
virt/kvm/arm/arch_timer.c | 8 +-
virt/kvm/arm/arm.c | 6 +-
- 411 files changed, 9823 insertions(+), 3817 deletions(-)
+ 411 files changed, 9822 insertions(+), 3852 deletions(-)
create mode 100644 Documentation/printk-ringbuffer.txt
create mode 100644 include/linux/locallock.h
create mode 100644 include/linux/mutex_rt.h
@@ -1566,7 +1566,7 @@ index a76f8ace9ce6..eb4a361d47d7 100644
+}
+#endif
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 384b1bf56667..750070cd057a 100644
+index 82eba7ffa1d5..73654de3ca2e 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -35,32 +35,32 @@ config ARM64
@@ -2341,10 +2341,10 @@ index c97c01c75566..a2b1b26c472a 100644
config ARCH_HAS_ILOG2_U32
bool
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
-index 2f64f112934b..2b33266cdeac 100644
+index 684a19d38198..2e59ca05824f 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
-@@ -942,14 +942,14 @@ intr_restore:
+@@ -941,14 +941,14 @@ intr_restore:
rfi
nop
@@ -2362,7 +2362,7 @@ index 2f64f112934b..2b33266cdeac 100644
* we jump back to intr_restore.
*/
LDREG PT_IASQ0(%r16), %r20
-@@ -981,7 +981,7 @@ intr_do_resched:
+@@ -980,7 +980,7 @@ intr_do_resched:
* and preempt_count is 0. otherwise, we continue on
* our merry way back to the current running task.
*/
@@ -2371,7 +2371,7 @@ index 2f64f112934b..2b33266cdeac 100644
.import preempt_schedule_irq,code
intr_do_preempt:
rsm PSW_SM_I, %r0 /* disable interrupts */
-@@ -1001,7 +1001,7 @@ intr_do_preempt:
+@@ -1000,7 +1000,7 @@ intr_do_preempt:
nop
b,n intr_restore /* ssm PSW_SM_I done by intr_restore */
@@ -2758,7 +2758,7 @@ index ff20c253f273..bba77ded0931 100644
_GLOBAL(call_do_irq)
mflr r0
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
-index 70b99246dec4..72602ed58cf8 100644
+index 402a05f3a484..bf280b7ebe01 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -171,7 +171,6 @@ extern void panic_flush_kmsg_start(void)
@@ -2988,7 +2988,7 @@ index 2100833adfb6..e448ca0fafcf 100644
pr_cont("SMP ");
if (debug_pagealloc_enabled())
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
-index 5cba1815b8f8..bcbbe275b8fe 100644
+index 6f28f6ca045b..be88fcf2d4d4 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -800,7 +800,7 @@ ENTRY(io_int_handler)
@@ -3856,7 +3856,7 @@ index 5c7ee3df4d0b..24bcc28f68d4 100644
/* TLB state for the entry code */
OFFSET(TLB_STATE_user_pcid_flush_mask, tlb_state, user_pcid_flush_mask);
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
-index 51d95c4b692c..79ce26ae4029 100644
+index cebbcc6c36ae..11546367c2cf 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -83,6 +83,7 @@ __visible void __irq_entry hv_stimer0_vector_handler(struct pt_regs *regs)
@@ -3968,10 +3968,10 @@ index 8ef71fa91ff8..764aa37782d1 100644
* Leave lazy mode, flushing any hypercalls made here.
* This must be done before restoring TLS segments so
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 8dd1d1c81c79..4e4f3ab153b9 100644
+index 07154cae7a15..2230fcdc6bfb 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
-@@ -7336,6 +7336,14 @@ int kvm_arch_init(void *opaque)
+@@ -7338,6 +7338,14 @@ int kvm_arch_init(void *opaque)
goto out;
}
@@ -4155,7 +4155,7 @@ index 9df50fb507ca..10244a1f8fee 100644
}
}
diff --git a/block/blk-mq.c b/block/blk-mq.c
-index 325a5944b4cb..da0bc4e2068d 100644
+index 6d2e897273a1..587145f29ce0 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -611,9 +611,17 @@ static void __blk_mq_complete_request(struct request *rq)
@@ -4186,7 +4186,7 @@ index 325a5944b4cb..da0bc4e2068d 100644
}
static void hctx_unlock(struct blk_mq_hw_ctx *hctx, int srcu_idx)
-@@ -1491,14 +1499,14 @@ static void __blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async,
+@@ -1507,14 +1515,14 @@ static void __blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async,
return;
if (!async && !(hctx->flags & BLK_MQ_F_BLOCKING)) {
@@ -4459,7 +4459,7 @@ index 364dd5eaebda..e1c12c036056 100644
} \
EXPORT_SYMBOL(get_random_ ##type);
diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c
-index b99e1941c52c..dc4c0a0a5129 100644
+index fde81ecbd6a3..56e56a09cc90 100644
--- a/drivers/char/tpm/tpm-dev-common.c
+++ b/drivers/char/tpm/tpm-dev-common.c
@@ -20,7 +20,6 @@
@@ -4543,7 +4543,7 @@ index 9bfe4c5af87e..3e02bc47e6d5 100644
bool "Exynos multi core timer driver" if COMPILE_TEST
depends on ARM || ARM64
diff --git a/drivers/clocksource/timer-atmel-tcb.c b/drivers/clocksource/timer-atmel-tcb.c
-index 7427b07495a8..ce6627ee161f 100644
+index 906c1bfdccad..d64fdf5a21b7 100644
--- a/drivers/clocksource/timer-atmel-tcb.c
+++ b/drivers/clocksource/timer-atmel-tcb.c
@@ -28,8 +28,7 @@
@@ -4693,7 +4693,7 @@ index 7427b07495a8..ce6627ee161f 100644
return ret;
}
-@@ -346,8 +375,6 @@ static void __init tcb_setup_single_chan(struct atmel_tc *tc, int mck_divisor_id
+@@ -347,8 +376,6 @@ static void __init tcb_setup_single_chan(struct atmel_tc *tc, int mck_divisor_id
writel(ATMEL_TC_SYNC, tcaddr + ATMEL_TC_BCR);
}
@@ -4702,7 +4702,7 @@ index 7427b07495a8..ce6627ee161f 100644
static const struct of_device_id atmel_tcb_of_match[] = {
{ .compatible = "atmel,at91rm9200-tcb", .data = (void *)16, },
{ .compatible = "atmel,at91sam9x5-tcb", .data = (void *)32, },
-@@ -467,7 +494,11 @@ static int __init tcb_clksrc_init(struct device_node *node)
+@@ -468,7 +495,11 @@ static int __init tcb_clksrc_init(struct device_node *node)
goto err_disable_t1;
/* channel 2: periodic and oneshot timer support */
@@ -4967,7 +4967,7 @@ index fc6c4f81985e..593f36afa57b 100644
help
Choose this option if you have an Intel I810 graphics card. If M is
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
-index 49b52ac3e473..cc41c3e159df 100644
+index 06c88dbc5a4a..f6ab66503d3a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -246,11 +246,9 @@ static int amdgpu_amdkfd_remove_eviction_fence(struct amdgpu_bo *bo,
@@ -5164,7 +5164,7 @@ index 926272b5a0ca..66c0380fc275 100644
static inline void
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
-index 65b5ca74b394..0e48a3d8ea22 100644
+index 910c10ee2c1a..6f8cea099b48 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
@@ -38,12 +38,15 @@ static int __engine_unpark(struct intel_wakeref *wf)
@@ -5314,10 +5314,10 @@ index 24f2944da09d..b8ee3cd14323 100644
TP_PROTO(struct i915_request *rq),
TP_ARGS(rq)
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 27b168936b2a..a3ae52ab9ace 100644
+index c7f50d9f7e37..775093ab9bc3 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -1824,6 +1824,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+@@ -1829,6 +1829,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
struct radeon_device *rdev = dev->dev_private;
/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
@@ -5325,7 +5325,7 @@ index 27b168936b2a..a3ae52ab9ace 100644
/* Get optional system timestamp before query. */
if (stime)
-@@ -1916,6 +1917,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+@@ -1921,6 +1922,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
*etime = ktime_get();
/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
@@ -5361,7 +5361,7 @@ index 356382a340b2..cb0373c7033d 100644
#include "hv_trace.h"
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
-index a1cfa7596853..ab454c085d55 100644
+index 01a2eeb2ec96..361f10e5c361 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -22,6 +22,7 @@
@@ -5397,10 +5397,10 @@ index 6dfa653d30db..29c35eb52414 100644
help
Allows a block device to be used as cache for other devices; uses
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index f3d60c4b34b8..ed80c4fe4c08 100644
+index 41556f5d4dcb..eae292684eb4 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
-@@ -2059,8 +2059,9 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
+@@ -2058,8 +2058,9 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
struct raid5_percpu *percpu;
unsigned long cpu;
@@ -5411,7 +5411,7 @@ index f3d60c4b34b8..ed80c4fe4c08 100644
if (test_bit(STRIPE_OP_BIOFILL, &ops_request)) {
ops_run_biofill(sh);
overlap_clear++;
-@@ -2119,7 +2120,8 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
+@@ -2118,7 +2119,8 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
if (test_and_clear_bit(R5_Overlap, &dev->flags))
wake_up(&sh->raid_conf->wait_for_overlap);
}
@@ -5421,7 +5421,7 @@ index f3d60c4b34b8..ed80c4fe4c08 100644
}
static void free_stripe(struct kmem_cache *sc, struct stripe_head *sh)
-@@ -6834,6 +6836,7 @@ static int raid456_cpu_up_prepare(unsigned int cpu, struct hlist_node *node)
+@@ -6831,6 +6833,7 @@ static int raid456_cpu_up_prepare(unsigned int cpu, struct hlist_node *node)
__func__, cpu);
return -ENOMEM;
}
@@ -5530,7 +5530,7 @@ index e2368bfe3e46..68e640dbe7ef 100644
break;
default:
diff --git a/drivers/of/base.c b/drivers/of/base.c
-index b5c84607a74b..6dd8969992de 100644
+index 6fa209b3557b..d70e93265802 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -123,115 +123,38 @@ int __weak of_node_to_nid(struct device_node *np)
@@ -5673,7 +5673,7 @@ index b5c84607a74b..6dd8969992de 100644
mutex_unlock(&of_mutex);
/* Symlink in /proc as required by userspace ABI */
-@@ -1223,36 +1149,29 @@ struct device_node *of_find_node_by_phandle(phandle handle)
+@@ -1259,36 +1185,29 @@ struct device_node *of_find_node_by_phandle(phandle handle)
{
struct device_node *np = NULL;
unsigned long flags;
@@ -5722,10 +5722,10 @@ index b5c84607a74b..6dd8969992de 100644
}
}
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
-index 49b16f76d78e..08fd823edac9 100644
+index ae969630958c..6ea8b2923b19 100644
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
-@@ -276,7 +276,7 @@ void __of_detach_node(struct device_node *np)
+@@ -278,7 +278,7 @@ void __of_detach_node(struct device_node *np)
of_node_set_flag(np, OF_DETACHED);
/* race with of_find_node_by_phandle() prevented by devtree_lock */
@@ -5755,7 +5755,7 @@ index 24786818e32e..de0042bc7701 100644
static inline void of_overlay_mutex_lock(void) {};
static inline void of_overlay_mutex_unlock(void) {};
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
-index dc298775f762..4443ecdb77bd 100644
+index b551fe44f2f9..ac037a06bc9c 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -974,8 +974,6 @@ static int of_overlay_apply(const void *fdt, struct device_node *tree,
@@ -5786,7 +5786,7 @@ index dc298775f762..4443ecdb77bd 100644
if (ret_apply)
devicetree_state_flags |= DTSF_REVERT_FAIL;
diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
-index 2c9c3061894b..90d6eb310e70 100644
+index 0b8325235852..3c547d198b0a 100644
--- a/drivers/pci/switch/switchtec.c
+++ b/drivers/pci/switch/switchtec.c
@@ -52,10 +52,11 @@ struct switchtec_user {
@@ -5862,7 +5862,7 @@ index 2c9c3061894b..90d6eb310e70 100644
ret |= EPOLLIN | EPOLLRDNORM;
if (stuser->event_cnt != atomic_read(&stdev->event_cnt))
-@@ -1106,7 +1109,8 @@ static void stdev_kill(struct switchtec_dev *stdev)
+@@ -1099,7 +1102,8 @@ static void stdev_kill(struct switchtec_dev *stdev)
/* Wake up and kill any users waiting on an MRPC request */
list_for_each_entry_safe(stuser, tmpuser, &stdev->mrpc_queue, list) {
@@ -5931,10 +5931,10 @@ index 00ddb3fd940f..dec588885da6 100644
}
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
-index d45e8c57051b..734a99681db8 100644
+index 7ce2a0434e1e..4564d1818b86 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
-@@ -828,7 +828,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
+@@ -826,7 +826,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
INIT_LIST_HEAD(&del_list);
@@ -5943,7 +5943,7 @@ index d45e8c57051b..734a99681db8 100644
list_for_each_entry_safe(fcf, next, &fip->fcfs, list) {
deadline = fcf->time + fcf->fka_period + fcf->fka_period / 2;
-@@ -864,7 +864,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
+@@ -862,7 +862,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
sel_time = fcf->time;
}
}
@@ -6279,7 +6279,7 @@ index a79ab53f8e87..b4b21f932be7 100644
static void mtk8250_set_flow_ctrl(struct uart_8250_port *up, int mode)
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
-index 4770513944d4..6910545bc79e 100644
+index 5d8022cdb50a..310ddd41952a 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -727,7 +727,7 @@ static void serial8250_set_sleep(struct uart_8250_port *p, int sleep)
@@ -6327,7 +6327,7 @@ index 4770513944d4..6910545bc79e 100644
serial8250_rpm_put(up);
}
-@@ -2074,14 +2074,7 @@ static void serial8250_put_poll_char(struct uart_port *port,
+@@ -2077,14 +2077,7 @@ static void serial8250_put_poll_char(struct uart_port *port,
struct uart_8250_port *up = up_to_u8250p(port);
serial8250_rpm_get(up);
@@ -6343,7 +6343,7 @@ index 4770513944d4..6910545bc79e 100644
wait_for_xmitr(up, BOTH_EMPTY);
/*
-@@ -2094,7 +2087,7 @@ static void serial8250_put_poll_char(struct uart_port *port,
+@@ -2097,7 +2090,7 @@ static void serial8250_put_poll_char(struct uart_port *port,
* and restore the IER
*/
wait_for_xmitr(up, BOTH_EMPTY);
@@ -6352,7 +6352,7 @@ index 4770513944d4..6910545bc79e 100644
serial8250_rpm_put(up);
}
-@@ -2409,7 +2402,7 @@ void serial8250_do_shutdown(struct uart_port *port)
+@@ -2412,7 +2405,7 @@ void serial8250_do_shutdown(struct uart_port *port)
*/
spin_lock_irqsave(&port->lock, flags);
up->ier = 0;
@@ -6361,7 +6361,7 @@ index 4770513944d4..6910545bc79e 100644
spin_unlock_irqrestore(&port->lock, flags);
synchronize_irq(port->irq);
-@@ -2705,7 +2698,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
+@@ -2708,7 +2701,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
if (up->capabilities & UART_CAP_RTOIE)
up->ier |= UART_IER_RTOIE;
@@ -6370,7 +6370,7 @@ index 4770513944d4..6910545bc79e 100644
if (up->capabilities & UART_CAP_EFR) {
unsigned char efr = 0;
-@@ -3171,7 +3164,7 @@ EXPORT_SYMBOL_GPL(serial8250_set_defaults);
+@@ -3174,7 +3167,7 @@ EXPORT_SYMBOL_GPL(serial8250_set_defaults);
#ifdef CONFIG_SERIAL_8250_CONSOLE
@@ -6379,7 +6379,7 @@ index 4770513944d4..6910545bc79e 100644
{
struct uart_8250_port *up = up_to_u8250p(port);
-@@ -3179,6 +3172,18 @@ static void serial8250_console_putchar(struct uart_port *port, int ch)
+@@ -3182,6 +3175,18 @@ static void serial8250_console_putchar(struct uart_port *port, int ch)
serial_port_out(port, UART_TX, ch);
}
@@ -6398,7 +6398,7 @@ index 4770513944d4..6910545bc79e 100644
/*
* Restore serial console when h/w power-off detected
*/
-@@ -3205,6 +3210,32 @@ static void serial8250_console_restore(struct uart_8250_port *up)
+@@ -3208,6 +3213,32 @@ static void serial8250_console_restore(struct uart_8250_port *up)
serial8250_out_MCR(up, up->mcr | UART_MCR_DTR | UART_MCR_RTS);
}
@@ -6431,7 +6431,7 @@ index 4770513944d4..6910545bc79e 100644
/*
* Print a string to the serial port trying not to disturb
* any possible real use of the port...
-@@ -3217,26 +3248,13 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
+@@ -3220,26 +3251,13 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
struct uart_port *port = &up->port;
unsigned long flags;
unsigned int ier;
@@ -6460,7 +6460,7 @@ index 4770513944d4..6910545bc79e 100644
/* check scratch reg to see if port powered off during system sleep */
if (up->canary && (up->canary != serial_port_in(port, UART_SCR))) {
-@@ -3244,14 +3262,16 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
+@@ -3247,14 +3265,16 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
up->canary = 0;
}
@@ -6478,7 +6478,7 @@ index 4770513944d4..6910545bc79e 100644
/*
* The receive handling will happen properly because the
-@@ -3263,8 +3283,7 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
+@@ -3266,8 +3286,7 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
if (up->msr_saved_flags)
serial8250_modem_status(up);
@@ -6488,7 +6488,7 @@ index 4770513944d4..6910545bc79e 100644
serial8250_rpm_put(up);
}
-@@ -3285,6 +3304,7 @@ static unsigned int probe_baud(struct uart_port *port)
+@@ -3288,6 +3307,7 @@ static unsigned int probe_baud(struct uart_port *port)
int serial8250_console_setup(struct uart_port *port, char *options, bool probe)
{
@@ -6496,7 +6496,7 @@ index 4770513944d4..6910545bc79e 100644
int baud = 9600;
int bits = 8;
int parity = 'n';
-@@ -3293,6 +3313,8 @@ int serial8250_console_setup(struct uart_port *port, char *options, bool probe)
+@@ -3296,6 +3316,8 @@ int serial8250_console_setup(struct uart_port *port, char *options, bool probe)
if (!port->iobase && !port->membase)
return -ENODEV;
@@ -6506,10 +6506,10 @@ index 4770513944d4..6910545bc79e 100644
uart_parse_options(options, &baud, &parity, &bits, &flow);
else if (probe)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 86084090232d..857588c2622c 100644
+index 5f9d0ae8129d..abaf23095b2b 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
-@@ -2222,18 +2222,24 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
+@@ -2218,18 +2218,24 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
{
struct uart_amba_port *uap = amba_ports[co->index];
unsigned int old_cr = 0, new_cr;
@@ -6538,7 +6538,7 @@ index 86084090232d..857588c2622c 100644
/*
* First save the CR then disable the interrupts
-@@ -2259,8 +2265,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
+@@ -2255,8 +2261,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
pl011_write(old_cr, uap, REG_CR);
if (locked)
@@ -6580,10 +6580,10 @@ index 6420ae581a80..0f4f41ed9ffa 100644
static int __init
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
-index 588a659f245e..b434c894c894 100644
+index 53658162b148..d3e4acddb3ce 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
-@@ -1724,7 +1724,7 @@ static void ffs_data_put(struct ffs_data *ffs)
+@@ -1728,7 +1728,7 @@ static void ffs_data_put(struct ffs_data *ffs)
ffs_data_clear(ffs);
ffs_release_dev(ffs->private_data);
BUG_ON(waitqueue_active(&ffs->ev.waitq) ||
@@ -6669,10 +6669,10 @@ index d94e2b7cddff..5197f7c3d31f 100644
_enter("%p{%pd},%llx", dentry, dentry, vnode->fid.vnode);
diff --git a/fs/aio.c b/fs/aio.c
-index 1ec5a773d09c..2d3bb9cd8836 100644
+index e8013c7ede27..d9211208e7f2 100644
--- a/fs/aio.c
+++ b/fs/aio.c
-@@ -1771,7 +1771,7 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync,
+@@ -1782,7 +1782,7 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync,
list_del_init(&req->wait.entry);
list_del(&iocb->ki_list);
iocb->ki_res.res = mangle_poll(mask);
@@ -6786,10 +6786,10 @@ index 3925a7bfc74d..33f7723fb83e 100644
cifs_dbg(FYI, "%s: for %s\n", __func__, name->name);
diff --git a/fs/dcache.c b/fs/dcache.c
-index b2a7f1765f0b..d0267103d4b3 100644
+index 78081bdc4931..1561474321fb 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -2484,9 +2484,10 @@ EXPORT_SYMBOL(d_rehash);
+@@ -2491,9 +2491,10 @@ EXPORT_SYMBOL(d_rehash);
static inline unsigned start_dir_add(struct inode *dir)
{
@@ -6802,7 +6802,7 @@ index b2a7f1765f0b..d0267103d4b3 100644
return n;
cpu_relax();
}
-@@ -2494,26 +2495,30 @@ static inline unsigned start_dir_add(struct inode *dir)
+@@ -2501,26 +2502,30 @@ static inline unsigned start_dir_add(struct inode *dir)
static inline void end_dir_add(struct inode *dir, unsigned n)
{
@@ -6845,7 +6845,7 @@ index b2a7f1765f0b..d0267103d4b3 100644
{
unsigned int hash = name->hash;
struct hlist_bl_head *b = in_lookup_hash(parent, hash);
-@@ -2527,7 +2532,7 @@ struct dentry *d_alloc_parallel(struct dentry *parent,
+@@ -2534,7 +2539,7 @@ struct dentry *d_alloc_parallel(struct dentry *parent,
retry:
rcu_read_lock();
@@ -6854,7 +6854,7 @@ index b2a7f1765f0b..d0267103d4b3 100644
r_seq = read_seqbegin(&rename_lock);
dentry = __d_lookup_rcu(parent, name, &d_seq);
if (unlikely(dentry)) {
-@@ -2555,7 +2560,7 @@ struct dentry *d_alloc_parallel(struct dentry *parent,
+@@ -2562,7 +2567,7 @@ struct dentry *d_alloc_parallel(struct dentry *parent,
}
hlist_bl_lock(b);
@@ -6863,7 +6863,7 @@ index b2a7f1765f0b..d0267103d4b3 100644
hlist_bl_unlock(b);
rcu_read_unlock();
goto retry;
-@@ -2628,7 +2633,7 @@ void __d_lookup_done(struct dentry *dentry)
+@@ -2635,7 +2640,7 @@ void __d_lookup_done(struct dentry *dentry)
hlist_bl_lock(b);
dentry->d_flags &= ~DCACHE_PAR_LOOKUP;
__hlist_bl_del(&dentry->d_u.d_in_lookup_hash);
@@ -6872,7 +6872,7 @@ index b2a7f1765f0b..d0267103d4b3 100644
dentry->d_wait = NULL;
hlist_bl_unlock(b);
INIT_HLIST_NODE(&dentry->d_u.d_alias);
-@@ -3141,6 +3146,8 @@ __setup("dhash_entries=", set_dhash_entries);
+@@ -3145,6 +3150,8 @@ __setup("dhash_entries=", set_dhash_entries);
static void __init dcache_init_early(void)
{
@@ -6881,7 +6881,7 @@ index b2a7f1765f0b..d0267103d4b3 100644
/* If hashes are distributed across NUMA nodes, defer
* hash allocation until vmalloc space is available.
*/
-@@ -3157,11 +3164,16 @@ static void __init dcache_init_early(void)
+@@ -3161,11 +3168,16 @@ static void __init dcache_init_early(void)
NULL,
0,
0);
@@ -6898,7 +6898,7 @@ index b2a7f1765f0b..d0267103d4b3 100644
/*
* A constructor could be added for stable state like the lists,
* but it is probably not worth it because of the cache nature
-@@ -3185,6 +3197,10 @@ static void __init dcache_init(void)
+@@ -3189,6 +3201,10 @@ static void __init dcache_init(void)
NULL,
0,
0);
@@ -7127,7 +7127,7 @@ index 512609da8590..4f7855a6c26f 100644
if (!o->nodeid) {
/*
diff --git a/fs/inode.c b/fs/inode.c
-index f7c8c0fe11d4..6797116bac8c 100644
+index 08c898333dbf..e652f224cced 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -157,7 +157,7 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
@@ -7140,10 +7140,10 @@ index f7c8c0fe11d4..6797116bac8c 100644
inode->dirtied_when = 0;
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
-index 7bd4b1d4224e..f697c457f3a4 100644
+index 255026497b8c..2a99995fcf08 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
-@@ -483,10 +483,10 @@ void jbd2_journal_commit_transaction(journal_t *journal)
+@@ -479,10 +479,10 @@ void jbd2_journal_commit_transaction(journal_t *journal)
if (jh->b_committed_data) {
struct buffer_head *bh = jh2bh(jh);
@@ -7156,7 +7156,7 @@ index 7bd4b1d4224e..f697c457f3a4 100644
}
jbd2_journal_refile_buffer(journal, jh);
}
-@@ -922,6 +922,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
+@@ -918,6 +918,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
transaction_t *cp_transaction;
struct buffer_head *bh;
int try_to_free = 0;
@@ -7164,7 +7164,7 @@ index 7bd4b1d4224e..f697c457f3a4 100644
jh = commit_transaction->t_forget;
spin_unlock(&journal->j_list_lock);
-@@ -931,7 +932,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
+@@ -927,7 +928,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
* done with it.
*/
get_bh(bh);
@@ -7173,7 +7173,7 @@ index 7bd4b1d4224e..f697c457f3a4 100644
J_ASSERT_JH(jh, jh->b_transaction == commit_transaction);
/*
-@@ -1031,8 +1032,10 @@ void jbd2_journal_commit_transaction(journal_t *journal)
+@@ -1027,8 +1028,10 @@ void jbd2_journal_commit_transaction(journal_t *journal)
try_to_free = 1;
}
JBUFFER_TRACE(jh, "refile or unfile buffer");
@@ -7187,10 +7187,10 @@ index 7bd4b1d4224e..f697c457f3a4 100644
release_buffer_page(bh); /* Drops bh reference */
else
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
-index eeebe64b7c54..b939bad9a8a7 100644
+index 564aedbd867f..69d1f032c6fc 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
-@@ -362,7 +362,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
+@@ -364,7 +364,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
/* keep subsequent assertions sane */
atomic_set(&new_bh->b_count, 1);
@@ -7199,7 +7199,7 @@ index eeebe64b7c54..b939bad9a8a7 100644
repeat:
/*
* If a new transaction has already done a buffer copy-out, then
-@@ -404,13 +404,13 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
+@@ -406,14 +406,14 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
if (need_copy_out && !done_copy_out) {
char *tmp;
@@ -7208,6 +7208,7 @@ index eeebe64b7c54..b939bad9a8a7 100644
tmp = jbd2_alloc(bh_in->b_size, GFP_NOFS);
if (!tmp) {
brelse(new_bh);
+ free_buffer_head(new_bh);
return -ENOMEM;
}
- jbd_lock_bh_state(bh_in);
@@ -7215,7 +7216,7 @@ index eeebe64b7c54..b939bad9a8a7 100644
if (jh_in->b_frozen_data) {
jbd2_free(tmp, bh_in->b_size);
goto repeat;
-@@ -463,7 +463,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
+@@ -466,7 +466,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
__jbd2_journal_file_buffer(jh_in, transaction, BJ_Shadow);
spin_unlock(&journal->j_list_lock);
set_buffer_shadow(bh_in);
@@ -7224,7 +7225,7 @@ index eeebe64b7c54..b939bad9a8a7 100644
return do_escape | (done_copy_out << 1);
}
-@@ -2392,6 +2392,8 @@ static struct journal_head *journal_alloc_journal_head(void)
+@@ -2397,6 +2397,8 @@ static struct journal_head *journal_alloc_journal_head(void)
ret = kmem_cache_zalloc(jbd2_journal_head_cache,
GFP_NOFS | __GFP_NOFAIL);
}
@@ -7233,7 +7234,7 @@ index eeebe64b7c54..b939bad9a8a7 100644
return ret;
}
-@@ -2511,17 +2513,23 @@ static void __journal_remove_journal_head(struct buffer_head *bh)
+@@ -2516,17 +2518,23 @@ static void __journal_remove_journal_head(struct buffer_head *bh)
J_ASSERT_BH(bh, buffer_jbd(bh));
J_ASSERT_BH(bh, jh2bh(jh) == bh);
BUFFER_TRACE(bh, "remove journal_head");
@@ -7262,7 +7263,7 @@ index eeebe64b7c54..b939bad9a8a7 100644
journal_free_journal_head(jh);
}
-@@ -2539,9 +2547,11 @@ void jbd2_journal_put_journal_head(struct journal_head *jh)
+@@ -2544,9 +2552,11 @@ void jbd2_journal_put_journal_head(struct journal_head *jh)
if (!jh->b_jcount) {
__journal_remove_journal_head(bh);
jbd_unlock_bh_journal_head(bh);
@@ -7742,7 +7743,7 @@ index 91c2d3f6d1b3..1670a2aa8020 100644
/*
diff --git a/fs/namei.c b/fs/namei.c
-index f6708ab8ec7e..e1cf56d0ba08 100644
+index a4cba6991a4d..e99e6d9c947c 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1638,7 +1638,7 @@ static struct dentry *__lookup_slow(const struct qstr *name,
@@ -7754,7 +7755,7 @@ index f6708ab8ec7e..e1cf56d0ba08 100644
/* Don't go there if it's already dead */
if (unlikely(IS_DEADDIR(inode)))
-@@ -3146,7 +3146,7 @@ static int lookup_open(struct nameidata *nd, struct path *path,
+@@ -3197,7 +3197,7 @@ static int lookup_open(struct nameidata *nd, struct path *path,
struct dentry *dentry;
int error, create_error = 0;
umode_t mode = op->mode;
@@ -7764,7 +7765,7 @@ index f6708ab8ec7e..e1cf56d0ba08 100644
if (unlikely(IS_DEADDIR(dir_inode)))
return -ENOENT;
diff --git a/fs/namespace.c b/fs/namespace.c
-index 5782cd55dfdb..6af700b53c73 100644
+index 281f08eaba5b..7439085dbec5 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -14,6 +14,7 @@
@@ -7854,10 +7855,10 @@ index 28ceee102d0b..7134b07bcc6a 100644
error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
trace_nfs_rmdir_exit(dir, dentry, error);
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index 3bddf5332b6d..f2c750da4d4d 100644
+index 251f45fee53c..3334a3567ea5 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
-@@ -2114,7 +2114,11 @@ static void init_once(void *foo)
+@@ -2115,7 +2115,11 @@ static void init_once(void *foo)
atomic_long_set(&nfsi->nrequests, 0);
atomic_long_set(&nfsi->commit_info.ncommit, 0);
atomic_set(&nfsi->commit_info.rpcs_out, 0);
@@ -7883,10 +7884,10 @@ index ebd77a301057..28ed21bff818 100644
};
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
-index c41d14962604..9cec53077c38 100644
+index 632cea3fb91d..356fb574da79 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
-@@ -2990,7 +2990,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
+@@ -2994,7 +2994,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
unsigned int seq;
int ret;
@@ -7895,7 +7896,7 @@ index c41d14962604..9cec53077c38 100644
dir_verifier = nfs_save_change_attribute(dir);
ret = _nfs4_proc_open(opendata, ctx);
-@@ -3044,7 +3044,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
+@@ -3048,7 +3048,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
if (d_inode(dentry) == state->inode) {
nfs_inode_attach_open_context(ctx);
@@ -7905,10 +7906,10 @@ index c41d14962604..9cec53077c38 100644
}
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
-index 01b185670594..271174f0bde6 100644
+index 1d38484e0a53..f7a5976de705 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
-@@ -513,7 +513,7 @@ nfs4_alloc_state_owner(struct nfs_server *server,
+@@ -514,7 +514,7 @@ nfs4_alloc_state_owner(struct nfs_server *server,
nfs4_init_seqid_counter(&sp->so_seqid);
atomic_set(&sp->so_count, 1);
INIT_LIST_HEAD(&sp->so_lru);
@@ -7917,7 +7918,7 @@ index 01b185670594..271174f0bde6 100644
mutex_init(&sp->so_delegreturn_mutex);
return sp;
}
-@@ -1623,8 +1623,12 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
+@@ -1624,8 +1624,12 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
* recovering after a network partition or a reboot from a
* server that doesn't support a grace period.
*/
@@ -7931,7 +7932,7 @@ index 01b185670594..271174f0bde6 100644
restart:
list_for_each_entry(state, &sp->so_states, open_states) {
if (!test_and_clear_bit(ops->state_flag_bit, &state->flags))
-@@ -1685,14 +1689,20 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
+@@ -1686,14 +1690,20 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
spin_lock(&sp->so_lock);
goto restart;
}
@@ -8144,10 +8145,10 @@ index 5e0eaea47405..92225a4df817 100644
ocfs2_journal_dirty(handle, group_bh);
bail:
diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 77a3eb7c39f5..51d51ee2aecf 100644
+index 34e15da39fdf..5d11c8ffddcc 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
-@@ -95,6 +95,7 @@
+@@ -96,6 +96,7 @@
#include <linux/sched/stat.h>
#include <linux/posix-timers.h>
#include <trace/events/oom.h>
@@ -8155,7 +8156,7 @@ index 77a3eb7c39f5..51d51ee2aecf 100644
#include "internal.h"
#include "fd.h"
-@@ -1899,7 +1900,7 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx,
+@@ -1958,7 +1959,7 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx,
child = d_hash_and_lookup(dir, &qname);
if (!child) {
@@ -8348,10 +8349,10 @@ index a19519f4241d..ef2366a65ba2 100644
static inline void local_bh_disable(void)
{
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
-index 5705cda3c4c4..fd630723200e 100644
+index 6107b537245a..95e0f14ce30f 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
-@@ -541,7 +541,7 @@ int bpf_prog_array_copy(struct bpf_prog_array *old_array,
+@@ -545,7 +545,7 @@ int bpf_prog_array_copy(struct bpf_prog_array *old_array,
struct bpf_prog *_prog; \
struct bpf_prog_array *_array; \
u32 _ret = 1; \
@@ -8360,7 +8361,7 @@ index 5705cda3c4c4..fd630723200e 100644
rcu_read_lock(); \
_array = rcu_dereference(array); \
if (unlikely(check_non_null && !_array))\
-@@ -555,7 +555,7 @@ int bpf_prog_array_copy(struct bpf_prog_array *old_array,
+@@ -559,7 +559,7 @@ int bpf_prog_array_copy(struct bpf_prog_array *old_array,
} \
_out: \
rcu_read_unlock(); \
@@ -8369,7 +8370,7 @@ index 5705cda3c4c4..fd630723200e 100644
_ret; \
})
-@@ -589,7 +589,7 @@ _out: \
+@@ -593,7 +593,7 @@ _out: \
u32 ret; \
u32 _ret = 1; \
u32 _cn = 0; \
@@ -8378,7 +8379,7 @@ index 5705cda3c4c4..fd630723200e 100644
rcu_read_lock(); \
_array = rcu_dereference(array); \
_item = &_array->items[0]; \
-@@ -601,7 +601,7 @@ _out: \
+@@ -605,7 +605,7 @@ _out: \
_item++; \
} \
rcu_read_unlock(); \
@@ -8387,7 +8388,7 @@ index 5705cda3c4c4..fd630723200e 100644
if (_ret) \
_ret = (_cn ? NET_XMIT_CN : NET_XMIT_SUCCESS); \
else \
-@@ -618,6 +618,36 @@ _out: \
+@@ -622,6 +622,36 @@ _out: \
#ifdef CONFIG_BPF_SYSCALL
DECLARE_PER_CPU(int, bpf_prog_active);
@@ -8449,7 +8450,7 @@ index 0575ad84cc55..70e73b8eabaf 100644
/*
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
-index d15884957e7f..8076fa031171 100644
+index f0798d98be8e..7426ac08f340 100644
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -144,9 +144,6 @@ struct cgroup_subsys_state {
@@ -8470,7 +8471,7 @@ index d15884957e7f..8076fa031171 100644
/* cgroup basic resource statistics */
struct cgroup_base_stat pending_bstat; /* pending from children */
-@@ -634,7 +630,6 @@ struct cgroup_subsys {
+@@ -635,7 +631,6 @@ struct cgroup_subsys {
void (*css_released)(struct cgroup_subsys_state *css);
void (*css_free)(struct cgroup_subsys_state *css);
void (*css_reset)(struct cgroup_subsys_state *css);
@@ -8657,10 +8658,10 @@ index de0ad39d4281..07f81c186ce0 100644
static inline void eventfd_ctx_do_read(struct eventfd_ctx *ctx, __u64 *cnt)
diff --git a/include/linux/filter.h b/include/linux/filter.h
-index 440014875acf..e83b6db44a47 100644
+index 0bec300b2e51..d62007508d41 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
-@@ -570,7 +570,7 @@ DECLARE_STATIC_KEY_FALSE(bpf_stats_enabled_key);
+@@ -574,7 +574,7 @@ DECLARE_STATIC_KEY_FALSE(bpf_stats_enabled_key);
#define BPF_PROG_RUN(prog, ctx) ({ \
u32 ret; \
@@ -8669,7 +8670,7 @@ index 440014875acf..e83b6db44a47 100644
if (static_branch_unlikely(&bpf_stats_enabled_key)) { \
struct bpf_prog_stats *stats; \
u64 start = sched_clock(); \
-@@ -585,6 +585,28 @@ DECLARE_STATIC_KEY_FALSE(bpf_stats_enabled_key);
+@@ -589,6 +589,28 @@ DECLARE_STATIC_KEY_FALSE(bpf_stats_enabled_key);
} \
ret; })
@@ -8698,7 +8699,7 @@ index 440014875acf..e83b6db44a47 100644
#define BPF_SKB_CB_LEN QDISC_CB_PRIV_LEN
struct bpf_skb_data_end {
-@@ -662,6 +684,7 @@ static inline u8 *bpf_skb_cb(struct sk_buff *skb)
+@@ -666,6 +688,7 @@ static inline u8 *bpf_skb_cb(struct sk_buff *skb)
return qdisc_skb_cb(skb)->data;
}
@@ -8706,7 +8707,7 @@ index 440014875acf..e83b6db44a47 100644
static inline u32 __bpf_prog_run_save_cb(const struct bpf_prog *prog,
struct sk_buff *skb)
{
-@@ -687,9 +710,9 @@ static inline u32 bpf_prog_run_save_cb(const struct bpf_prog *prog,
+@@ -691,9 +714,9 @@ static inline u32 bpf_prog_run_save_cb(const struct bpf_prog *prog,
{
u32 res;
@@ -8718,7 +8719,7 @@ index 440014875acf..e83b6db44a47 100644
return res;
}
-@@ -702,9 +725,7 @@ static inline u32 bpf_prog_run_clear_cb(const struct bpf_prog *prog,
+@@ -706,9 +729,7 @@ static inline u32 bpf_prog_run_clear_cb(const struct bpf_prog *prog,
if (unlikely(prog->cb_access))
memset(cb_data, 0, BPF_SKB_CB_LEN);
@@ -8730,10 +8731,10 @@ index 440014875acf..e83b6db44a47 100644
}
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 4b1553f570f2..299310d278a2 100644
+index c0967df13715..ac9da6bb2a60 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -717,7 +717,7 @@ struct inode {
+@@ -719,7 +719,7 @@ struct inode {
struct block_device *i_bdev;
struct cdev *i_cdev;
char *i_link;
@@ -8742,7 +8743,7 @@ index 4b1553f570f2..299310d278a2 100644
};
__u32 i_generation;
-@@ -856,7 +856,7 @@ static inline loff_t i_size_read(const struct inode *inode)
+@@ -858,7 +858,7 @@ static inline loff_t i_size_read(const struct inode *inode)
i_size = inode->i_size;
} while (read_seqcount_retry(&inode->i_size_seqcount, seq));
return i_size;
@@ -8751,7 +8752,7 @@ index 4b1553f570f2..299310d278a2 100644
loff_t i_size;
preempt_disable();
-@@ -881,7 +881,7 @@ static inline void i_size_write(struct inode *inode, loff_t i_size)
+@@ -883,7 +883,7 @@ static inline void i_size_write(struct inode *inode, loff_t i_size)
inode->i_size = i_size;
write_seqcount_end(&inode->i_size_seqcount);
preempt_enable();
@@ -8910,7 +8911,7 @@ index 900f224bb640..681d31133b7a 100644
}
diff --git a/include/linux/idr.h b/include/linux/idr.h
-index ac6e946b6767..839da8f2f6f1 100644
+index bbfd934cab22..a6b48f89e7d0 100644
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -169,10 +169,7 @@ static inline bool idr_is_empty(const struct idr *idr)
@@ -9024,7 +9025,7 @@ index 21619c92c377..5304de2f7838 100644
defined(CONFIG_PREEMPT_TRACER)
extern void stop_critical_timings(void);
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
-index b60adc4210b5..518dbb2305cf 100644
+index 45c7e21ba1af..9d709139db11 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -313,7 +313,6 @@ enum jbd_state_bits {
@@ -9575,7 +9576,7 @@ index 000000000000..9b6b4def52d4
+
+#endif
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 2b3b2fc1cb33..402d2cb6ca77 100644
+index afbe3056a8d7..19e19d42e689 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -12,6 +12,7 @@
@@ -9776,7 +9777,7 @@ index 000000000000..3fcb5edb1d2b
+
+#endif
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index bf623f0e04d6..590bccff0a4a 100644
+index a6bb64dccb88..9d37a400e9c8 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3059,6 +3059,7 @@ struct softnet_data {
@@ -10158,7 +10159,7 @@ index 3d10c84a97a9..bad09364b20a 100644
#else
struct posix_cputimers { };
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
-index bbb68dba37cc..bbc3592b6f04 100644
+index bc3f1aecaa19..bbc3592b6f04 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -78,10 +78,8 @@
@@ -10354,6 +10355,41 @@ index bbb68dba37cc..bbc3592b6f04 100644
#ifdef CONFIG_PREEMPT_NOTIFIERS
struct preempt_notifier;
+@@ -322,34 +419,4 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier,
+
+ #endif
+
+-/**
+- * migrate_disable - Prevent migration of the current task
+- *
+- * Maps to preempt_disable() which also disables preemption. Use
+- * migrate_disable() to annotate that the intent is to prevent migration,
+- * but not necessarily preemption.
+- *
+- * Can be invoked nested like preempt_disable() and needs the corresponding
+- * number of migrate_enable() invocations.
+- */
+-static __always_inline void migrate_disable(void)
+-{
+- preempt_disable();
+-}
+-
+-/**
+- * migrate_enable - Allow migration of the current task
+- *
+- * Counterpart to migrate_disable().
+- *
+- * As migrate_disable() can be invoked nested, only the outermost invocation
+- * reenables migration.
+- *
+- * Currently mapped to preempt_enable().
+- */
+-static __always_inline void migrate_enable(void)
+-{
+- preempt_enable();
+-}
+-
+ #endif /* __LINUX_PREEMPT_H */
diff --git a/include/linux/printk.h b/include/linux/printk.h
index eb2a093ba042..1fe8068100c2 100644
--- a/include/linux/printk.h
@@ -10681,7 +10717,7 @@ index 000000000000..78c05f606a73
+
+#endif
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
-index c75b38ba4a72..0fa23420bda2 100644
+index bc4b5c905a60..2a6cef3e4ce3 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -29,6 +29,7 @@
@@ -10722,7 +10758,7 @@ index c75b38ba4a72..0fa23420bda2 100644
*/
#define cond_resched_tasks_rcu_qs() \
do { \
-@@ -281,7 +289,8 @@ static inline void rcu_preempt_sleep_check(void) { }
+@@ -312,7 +320,8 @@ static inline void rcu_preempt_sleep_check(void) { }
#define rcu_sleep_check() \
do { \
rcu_preempt_sleep_check(); \
@@ -10732,7 +10768,7 @@ index c75b38ba4a72..0fa23420bda2 100644
"Illegal context switch in RCU-bh read-side critical section"); \
RCU_LOCKDEP_WARN(lock_is_held(&rcu_sched_lock_map), \
"Illegal context switch in RCU-sched read-side critical section"); \
-@@ -302,13 +311,6 @@ static inline void rcu_preempt_sleep_check(void) { }
+@@ -333,13 +342,6 @@ static inline void rcu_preempt_sleep_check(void) { }
* (e.g., __srcu), should this make sense in the future.
*/
@@ -10746,7 +10782,7 @@ index c75b38ba4a72..0fa23420bda2 100644
#define __rcu_access_pointer(p, space) \
({ \
typeof(*p) *_________p1 = (typeof(*p) *__force)READ_ONCE(p); \
-@@ -336,54 +338,6 @@ static inline void rcu_preempt_sleep_check(void) { }
+@@ -367,54 +369,6 @@ static inline void rcu_preempt_sleep_check(void) { }
((typeof(*p) __force __kernel *)(________p1)); \
})
@@ -10801,7 +10837,7 @@ index c75b38ba4a72..0fa23420bda2 100644
/**
* rcu_replace_pointer() - replace an RCU pointer, returning its old value
* @rcu_ptr: RCU pointer, whose old value is returned
-@@ -600,7 +554,7 @@ do { \
+@@ -631,7 +585,7 @@ do { \
*
* You can avoid reading and understanding the next paragraph by
* following this rule: don't put anything in an rcu_read_lock() RCU
@@ -11706,7 +11742,7 @@ index 1a5f88316b08..1870c233799e 100644
/* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */
static inline int valid_signal(unsigned long sig)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index 302a2ad67980..31b880d5062e 100644
+index 3191d0ffc6e9..6f4111b37521 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -294,6 +294,7 @@ struct sk_buff_head {
@@ -11717,7 +11753,7 @@ index 302a2ad67980..31b880d5062e 100644
};
struct sk_buff;
-@@ -1866,6 +1867,12 @@ static inline void skb_queue_head_init(struct sk_buff_head *list)
+@@ -1863,6 +1864,12 @@ static inline void skb_queue_head_init(struct sk_buff_head *list)
__skb_queue_head_init(list);
}
@@ -12312,7 +12348,7 @@ index f3040b0b4b23..3cb02ced141b 100644
#ifndef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES
static inline int arch_within_stack_frames(const void * const stack,
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
-index a8e9d1a04f82..dd5d97c37394 100644
+index d88622a9db7b..e4ef0088bda1 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -62,6 +62,8 @@ struct trace_entry {
@@ -12480,7 +12516,7 @@ index 000000000000..67710bace741
+
+#endif
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
-index e8034756cbf8..49176f44b677 100644
+index 6d934ce54c8d..61d165c0af00 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -10,6 +10,7 @@
@@ -12706,7 +12742,7 @@ index deff97217496..7871ec3c9a02 100644
prompt "Preemption Model"
default PREEMPT_NONE
diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c
-index 03a67583f6fb..02b5e8e3c04a 100644
+index 0d14a2a11463..93c73f1dc7cd 100644
--- a/kernel/bpf/hashtab.c
+++ b/kernel/bpf/hashtab.c
@@ -17,9 +17,62 @@
@@ -12837,7 +12873,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
static inline void htab_elem_set_ptr(struct htab_elem *l, u32 key_size,
void __percpu *pptr)
{
-@@ -306,8 +399,8 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr)
+@@ -309,8 +402,8 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr)
bool percpu_lru = (attr->map_flags & BPF_F_NO_COMMON_LRU);
bool prealloc = !(attr->map_flags & BPF_F_NO_PREALLOC);
struct bpf_htab *htab;
@@ -12847,7 +12883,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
htab = kzalloc(sizeof(*htab), GFP_USER);
if (!htab)
-@@ -369,10 +462,7 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr)
+@@ -376,10 +469,7 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr)
else
htab->hashrnd = get_random_int();
@@ -12859,7 +12895,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
if (prealloc) {
err = prealloc_init(htab);
-@@ -580,7 +670,7 @@ static bool htab_lru_map_delete_node(void *arg, struct bpf_lru_node *node)
+@@ -587,7 +677,7 @@ static bool htab_lru_map_delete_node(void *arg, struct bpf_lru_node *node)
b = __select_bucket(htab, tgt_l->hash);
head = &b->head;
@@ -12868,7 +12904,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
hlist_nulls_for_each_entry_rcu(l, n, head, hash_node)
if (l == tgt_l) {
-@@ -588,7 +678,7 @@ static bool htab_lru_map_delete_node(void *arg, struct bpf_lru_node *node)
+@@ -595,7 +685,7 @@ static bool htab_lru_map_delete_node(void *arg, struct bpf_lru_node *node)
break;
}
@@ -12877,7 +12913,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
return l == tgt_l;
}
-@@ -886,8 +976,7 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value,
+@@ -893,8 +983,7 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value,
*/
}
@@ -12887,7 +12923,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
l_old = lookup_elem_raw(head, hash, key, key_size);
-@@ -928,7 +1017,7 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value,
+@@ -935,7 +1024,7 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value,
}
ret = 0;
err:
@@ -12896,7 +12932,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
return ret;
}
-@@ -966,8 +1055,7 @@ static int htab_lru_map_update_elem(struct bpf_map *map, void *key, void *value,
+@@ -973,8 +1062,7 @@ static int htab_lru_map_update_elem(struct bpf_map *map, void *key, void *value,
return -ENOMEM;
memcpy(l_new->key + round_up(map->key_size, 8), value, map->value_size);
@@ -12906,7 +12942,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
l_old = lookup_elem_raw(head, hash, key, key_size);
-@@ -986,7 +1074,7 @@ static int htab_lru_map_update_elem(struct bpf_map *map, void *key, void *value,
+@@ -993,7 +1081,7 @@ static int htab_lru_map_update_elem(struct bpf_map *map, void *key, void *value,
ret = 0;
err:
@@ -12915,7 +12951,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
if (ret)
bpf_lru_push_free(&htab->lru, &l_new->lru_node);
-@@ -1021,8 +1109,7 @@ static int __htab_percpu_map_update_elem(struct bpf_map *map, void *key,
+@@ -1028,8 +1116,7 @@ static int __htab_percpu_map_update_elem(struct bpf_map *map, void *key,
b = __select_bucket(htab, hash);
head = &b->head;
@@ -12925,7 +12961,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
l_old = lookup_elem_raw(head, hash, key, key_size);
-@@ -1045,7 +1132,7 @@ static int __htab_percpu_map_update_elem(struct bpf_map *map, void *key,
+@@ -1052,7 +1139,7 @@ static int __htab_percpu_map_update_elem(struct bpf_map *map, void *key,
}
ret = 0;
err:
@@ -12934,7 +12970,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
return ret;
}
-@@ -1085,8 +1172,7 @@ static int __htab_lru_percpu_map_update_elem(struct bpf_map *map, void *key,
+@@ -1092,8 +1179,7 @@ static int __htab_lru_percpu_map_update_elem(struct bpf_map *map, void *key,
return -ENOMEM;
}
@@ -12944,7 +12980,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
l_old = lookup_elem_raw(head, hash, key, key_size);
-@@ -1108,7 +1194,7 @@ static int __htab_lru_percpu_map_update_elem(struct bpf_map *map, void *key,
+@@ -1115,7 +1201,7 @@ static int __htab_lru_percpu_map_update_elem(struct bpf_map *map, void *key,
}
ret = 0;
err:
@@ -12953,7 +12989,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
if (l_new)
bpf_lru_push_free(&htab->lru, &l_new->lru_node);
return ret;
-@@ -1146,7 +1232,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key)
+@@ -1153,7 +1239,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key)
b = __select_bucket(htab, hash);
head = &b->head;
@@ -12962,7 +12998,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
l = lookup_elem_raw(head, hash, key, key_size);
-@@ -1156,7 +1242,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key)
+@@ -1163,7 +1249,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key)
ret = 0;
}
@@ -12971,7 +13007,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
return ret;
}
-@@ -1178,7 +1264,7 @@ static int htab_lru_map_delete_elem(struct bpf_map *map, void *key)
+@@ -1185,7 +1271,7 @@ static int htab_lru_map_delete_elem(struct bpf_map *map, void *key)
b = __select_bucket(htab, hash);
head = &b->head;
@@ -12980,7 +13016,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
l = lookup_elem_raw(head, hash, key, key_size);
-@@ -1187,7 +1273,7 @@ static int htab_lru_map_delete_elem(struct bpf_map *map, void *key)
+@@ -1194,7 +1280,7 @@ static int htab_lru_map_delete_elem(struct bpf_map *map, void *key)
ret = 0;
}
@@ -12990,7 +13026,7 @@ index 03a67583f6fb..02b5e8e3c04a 100644
bpf_lru_push_free(&htab->lru, &l->lru_node);
return ret;
diff --git a/kernel/bpf/lpm_trie.c b/kernel/bpf/lpm_trie.c
-index 56e6c75d354d..3b3c420bc8ed 100644
+index f726ceb8d7e9..c528721770d0 100644
--- a/kernel/bpf/lpm_trie.c
+++ b/kernel/bpf/lpm_trie.c
@@ -34,7 +34,7 @@ struct lpm_trie {
@@ -13002,7 +13038,7 @@ index 56e6c75d354d..3b3c420bc8ed 100644
};
/* This trie implements a longest prefix match algorithm that can be used to
-@@ -315,7 +315,7 @@ static int trie_update_elem(struct bpf_map *map,
+@@ -318,7 +318,7 @@ static int trie_update_elem(struct bpf_map *map,
if (key->prefixlen > trie->max_prefixlen)
return -EINVAL;
@@ -13011,7 +13047,7 @@ index 56e6c75d354d..3b3c420bc8ed 100644
/* Allocate and fill a new node */
-@@ -422,7 +422,7 @@ static int trie_update_elem(struct bpf_map *map,
+@@ -442,7 +442,7 @@ static int trie_update_elem(struct bpf_map *map,
kfree(im_node);
}
@@ -13020,7 +13056,7 @@ index 56e6c75d354d..3b3c420bc8ed 100644
return ret;
}
-@@ -442,7 +442,7 @@ static int trie_delete_elem(struct bpf_map *map, void *_key)
+@@ -462,7 +462,7 @@ static int trie_delete_elem(struct bpf_map *map, void *_key)
if (key->prefixlen > trie->max_prefixlen)
return -EINVAL;
@@ -13029,7 +13065,7 @@ index 56e6c75d354d..3b3c420bc8ed 100644
/* Walk the tree looking for an exact key/length match and keeping
* track of the path we traverse. We will need to know the node
-@@ -518,7 +518,7 @@ static int trie_delete_elem(struct bpf_map *map, void *_key)
+@@ -538,7 +538,7 @@ static int trie_delete_elem(struct bpf_map *map, void *_key)
kfree_rcu(node, rcu);
out:
@@ -13038,7 +13074,7 @@ index 56e6c75d354d..3b3c420bc8ed 100644
return ret;
}
-@@ -575,7 +575,7 @@ static struct bpf_map *trie_alloc(union bpf_attr *attr)
+@@ -595,7 +595,7 @@ static struct bpf_map *trie_alloc(union bpf_attr *attr)
if (ret)
goto out_err;
@@ -13105,7 +13141,7 @@ index 6e090140b924..b367430e611c 100644
struct pcpu_freelist_node *__pcpu_freelist_pop(struct pcpu_freelist *s)
diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c
-index 811071c227f1..db07ea23ca7f 100644
+index bd8516d96745..7c22eace06b6 100644
--- a/kernel/bpf/stackmap.c
+++ b/kernel/bpf/stackmap.c
@@ -40,6 +40,9 @@ static void do_up_read(struct irq_work *entry)
@@ -13118,7 +13154,7 @@ index 811071c227f1..db07ea23ca7f 100644
work = container_of(entry, struct stack_map_irq_work, irq_work);
up_read_non_owner(work->sem);
work->sem = NULL;
-@@ -291,10 +294,18 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs,
+@@ -294,10 +297,18 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs,
struct stack_map_irq_work *work = NULL;
if (irqs_disabled()) {
@@ -13204,10 +13240,10 @@ index de788761b708..f597b34d756b 100644
out:
kfree(key);
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
-index 530664693ac4..3e86a9e3242b 100644
+index 013b9062c47c..a26dd71a813f 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
-@@ -8157,26 +8157,48 @@ static bool is_tracing_prog_type(enum bpf_prog_type type)
+@@ -8162,26 +8162,48 @@ static bool is_tracing_prog_type(enum bpf_prog_type type)
}
}
@@ -13266,10 +13302,10 @@ index 530664693ac4..3e86a9e3242b 100644
if ((is_tracing_prog_type(prog->type) ||
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
-index 62a7a5075014..59e107d22b2b 100644
+index 273a8a42cb72..b8999849a228 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
-@@ -1997,7 +1997,6 @@ static void init_cgroup_housekeeping(struct cgroup *cgrp)
+@@ -2006,7 +2006,6 @@ static void init_cgroup_housekeeping(struct cgroup *cgrp)
cgrp->dom_cgrp = cgrp;
cgrp->max_descendants = INT_MAX;
cgrp->max_depth = INT_MAX;
@@ -13277,7 +13313,7 @@ index 62a7a5075014..59e107d22b2b 100644
prev_cputime_init(&cgrp->prev_cputime);
for_each_subsys(ss, ssid)
-@@ -5182,12 +5181,6 @@ static void css_release_work_fn(struct work_struct *work)
+@@ -5191,12 +5190,6 @@ static void css_release_work_fn(struct work_struct *work)
list_del_rcu(&css->sibling);
if (ss) {
@@ -13290,7 +13326,7 @@ index 62a7a5075014..59e107d22b2b 100644
cgroup_idr_replace(&ss->css_idr, NULL, css->id);
if (ss->css_released)
ss->css_released(css);
-@@ -5249,7 +5242,6 @@ static void init_and_link_css(struct cgroup_subsys_state *css,
+@@ -5258,7 +5251,6 @@ static void init_and_link_css(struct cgroup_subsys_state *css,
css->id = -1;
INIT_LIST_HEAD(&css->sibling);
INIT_LIST_HEAD(&css->children);
@@ -13298,7 +13334,7 @@ index 62a7a5075014..59e107d22b2b 100644
css->serial_nr = css_serial_nr_next++;
atomic_set(&css->online_cnt, 0);
-@@ -5258,9 +5250,6 @@ static void init_and_link_css(struct cgroup_subsys_state *css,
+@@ -5267,9 +5259,6 @@ static void init_and_link_css(struct cgroup_subsys_state *css,
css_get(css->parent);
}
@@ -13308,7 +13344,7 @@ index 62a7a5075014..59e107d22b2b 100644
BUG_ON(cgroup_css(cgrp, ss));
}
-@@ -5362,7 +5351,6 @@ static struct cgroup_subsys_state *css_create(struct cgroup *cgrp,
+@@ -5371,7 +5360,6 @@ static struct cgroup_subsys_state *css_create(struct cgroup *cgrp,
err_list_del:
list_del_rcu(&css->sibling);
err_free_css:
@@ -13317,10 +13353,10 @@ index 62a7a5075014..59e107d22b2b 100644
queue_rcu_work(cgroup_destroy_wq, &css->destroy_rwork);
return ERR_PTR(err);
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
-index 5d50ac2f2652..99266c15b4c0 100644
+index 807fc3fbd5ab..c333d1d86cf5 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
-@@ -346,7 +346,7 @@ void cpuset_read_unlock(void)
+@@ -347,7 +347,7 @@ void cpuset_read_unlock(void)
percpu_up_read(&cpuset_rwsem);
}
@@ -13329,7 +13365,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
static struct workqueue_struct *cpuset_migrate_mm_wq;
-@@ -1287,7 +1287,7 @@ static int update_parent_subparts_cpumask(struct cpuset *cpuset, int cmd,
+@@ -1288,7 +1288,7 @@ static int update_parent_subparts_cpumask(struct cpuset *cpuset, int cmd,
* Newly added CPUs will be removed from effective_cpus and
* newly deleted ones will be added back to effective_cpus.
*/
@@ -13338,7 +13374,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
if (adding) {
cpumask_or(parent->subparts_cpus,
parent->subparts_cpus, tmp->addmask);
-@@ -1306,7 +1306,7 @@ static int update_parent_subparts_cpumask(struct cpuset *cpuset, int cmd,
+@@ -1307,7 +1307,7 @@ static int update_parent_subparts_cpumask(struct cpuset *cpuset, int cmd,
}
parent->nr_subparts_cpus = cpumask_weight(parent->subparts_cpus);
@@ -13347,7 +13383,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
return cmd == partcmd_update;
}
-@@ -1411,7 +1411,7 @@ static void update_cpumasks_hier(struct cpuset *cs, struct tmpmasks *tmp)
+@@ -1412,7 +1412,7 @@ static void update_cpumasks_hier(struct cpuset *cs, struct tmpmasks *tmp)
continue;
rcu_read_unlock();
@@ -13356,7 +13392,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
cpumask_copy(cp->effective_cpus, tmp->new_cpus);
if (cp->nr_subparts_cpus &&
-@@ -1442,7 +1442,7 @@ static void update_cpumasks_hier(struct cpuset *cs, struct tmpmasks *tmp)
+@@ -1443,7 +1443,7 @@ static void update_cpumasks_hier(struct cpuset *cs, struct tmpmasks *tmp)
= cpumask_weight(cp->subparts_cpus);
}
}
@@ -13365,7 +13401,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
WARN_ON(!is_in_v2_mode() &&
!cpumask_equal(cp->cpus_allowed, cp->effective_cpus));
-@@ -1570,7 +1570,7 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs,
+@@ -1571,7 +1571,7 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs,
return -EINVAL;
}
@@ -13374,7 +13410,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
cpumask_copy(cs->cpus_allowed, trialcs->cpus_allowed);
/*
-@@ -1580,7 +1580,7 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs,
+@@ -1581,7 +1581,7 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs,
cpumask_and(cs->subparts_cpus, cs->subparts_cpus, cs->cpus_allowed);
cs->nr_subparts_cpus = cpumask_weight(cs->subparts_cpus);
}
@@ -13383,7 +13419,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
update_cpumasks_hier(cs, &tmp);
-@@ -1774,9 +1774,9 @@ static void update_nodemasks_hier(struct cpuset *cs, nodemask_t *new_mems)
+@@ -1775,9 +1775,9 @@ static void update_nodemasks_hier(struct cpuset *cs, nodemask_t *new_mems)
continue;
rcu_read_unlock();
@@ -13395,7 +13431,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
WARN_ON(!is_in_v2_mode() &&
!nodes_equal(cp->mems_allowed, cp->effective_mems));
-@@ -1844,9 +1844,9 @@ static int update_nodemask(struct cpuset *cs, struct cpuset *trialcs,
+@@ -1845,9 +1845,9 @@ static int update_nodemask(struct cpuset *cs, struct cpuset *trialcs,
if (retval < 0)
goto done;
@@ -13407,7 +13443,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
/* use trialcs->mems_allowed as a temp variable */
update_nodemasks_hier(cs, &trialcs->mems_allowed);
-@@ -1937,9 +1937,9 @@ static int update_flag(cpuset_flagbits_t bit, struct cpuset *cs,
+@@ -1938,9 +1938,9 @@ static int update_flag(cpuset_flagbits_t bit, struct cpuset *cs,
spread_flag_changed = ((is_spread_slab(cs) != is_spread_slab(trialcs))
|| (is_spread_page(cs) != is_spread_page(trialcs)));
@@ -13419,7 +13455,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
if (!cpumask_empty(trialcs->cpus_allowed) && balance_flag_changed)
rebuild_sched_domains_locked();
-@@ -2448,7 +2448,7 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
+@@ -2449,7 +2449,7 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
cpuset_filetype_t type = seq_cft(sf)->private;
int ret = 0;
@@ -13428,7 +13464,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
switch (type) {
case FILE_CPULIST:
-@@ -2470,7 +2470,7 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
+@@ -2471,7 +2471,7 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
ret = -EINVAL;
}
@@ -13437,7 +13473,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
return ret;
}
-@@ -2783,14 +2783,14 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
+@@ -2784,14 +2784,14 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
cpuset_inc();
@@ -13454,7 +13490,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
if (!test_bit(CGRP_CPUSET_CLONE_CHILDREN, &css->cgroup->flags))
goto out_unlock;
-@@ -2817,12 +2817,12 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
+@@ -2818,12 +2818,12 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
}
rcu_read_unlock();
@@ -13469,7 +13505,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
out_unlock:
percpu_up_write(&cpuset_rwsem);
put_online_cpus();
-@@ -2878,7 +2878,7 @@ static void cpuset_css_free(struct cgroup_subsys_state *css)
+@@ -2879,7 +2879,7 @@ static void cpuset_css_free(struct cgroup_subsys_state *css)
static void cpuset_bind(struct cgroup_subsys_state *root_css)
{
percpu_down_write(&cpuset_rwsem);
@@ -13478,7 +13514,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
if (is_in_v2_mode()) {
cpumask_copy(top_cpuset.cpus_allowed, cpu_possible_mask);
-@@ -2889,7 +2889,7 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css)
+@@ -2890,7 +2890,7 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css)
top_cpuset.mems_allowed = top_cpuset.effective_mems;
}
@@ -13487,7 +13523,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
percpu_up_write(&cpuset_rwsem);
}
-@@ -2986,12 +2986,12 @@ hotplug_update_tasks_legacy(struct cpuset *cs,
+@@ -2987,12 +2987,12 @@ hotplug_update_tasks_legacy(struct cpuset *cs,
{
bool is_empty;
@@ -13502,7 +13538,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
/*
* Don't call update_tasks_cpumask() if the cpuset becomes empty,
-@@ -3028,10 +3028,10 @@ hotplug_update_tasks(struct cpuset *cs,
+@@ -3029,10 +3029,10 @@ hotplug_update_tasks(struct cpuset *cs,
if (nodes_empty(*new_mems))
*new_mems = parent_cs(cs)->effective_mems;
@@ -13515,7 +13551,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
if (cpus_updated)
update_tasks_cpumask(cs);
-@@ -3193,7 +3193,7 @@ static void cpuset_hotplug_workfn(struct work_struct *work)
+@@ -3194,7 +3194,7 @@ static void cpuset_hotplug_workfn(struct work_struct *work)
/* synchronize cpus_allowed to cpu_active_mask */
if (cpus_updated) {
@@ -13524,7 +13560,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
if (!on_dfl)
cpumask_copy(top_cpuset.cpus_allowed, &new_cpus);
/*
-@@ -3213,17 +3213,17 @@ static void cpuset_hotplug_workfn(struct work_struct *work)
+@@ -3214,17 +3214,17 @@ static void cpuset_hotplug_workfn(struct work_struct *work)
}
}
cpumask_copy(top_cpuset.effective_cpus, &new_cpus);
@@ -13545,7 +13581,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
update_tasks_nodemask(&top_cpuset);
}
-@@ -3327,11 +3327,11 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask)
+@@ -3328,11 +3328,11 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask)
{
unsigned long flags;
@@ -13559,7 +13595,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
}
/**
-@@ -3392,11 +3392,11 @@ nodemask_t cpuset_mems_allowed(struct task_struct *tsk)
+@@ -3393,11 +3393,11 @@ nodemask_t cpuset_mems_allowed(struct task_struct *tsk)
nodemask_t mask;
unsigned long flags;
@@ -13573,7 +13609,7 @@ index 5d50ac2f2652..99266c15b4c0 100644
return mask;
}
-@@ -3488,14 +3488,14 @@ bool __cpuset_node_allowed(int node, gfp_t gfp_mask)
+@@ -3489,14 +3489,14 @@ bool __cpuset_node_allowed(int node, gfp_t gfp_mask)
return true;
/* Not hardwall and node outside mems_allowed: scan up cpusets */
@@ -13693,7 +13729,7 @@ index 4a942d4e9763..49315054a1bc 100644
int cgroup_rstat_init(struct cgroup *cgrp)
diff --git a/kernel/cpu.c b/kernel/cpu.c
-index c08456af0c7f..cd0a0bfbd178 100644
+index ba579bb6b897..e9e807d2bd26 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -334,12 +334,12 @@ void lockdep_assert_cpus_held(void)
@@ -13789,10 +13825,10 @@ index c08456af0c7f..cd0a0bfbd178 100644
irq_unlock_sparse();
diff --git a/kernel/events/core.c b/kernel/events/core.c
-index 875b3c27eab0..7b332babac3a 100644
+index e1e546d742be..714385963f3c 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
-@@ -9005,7 +9005,6 @@ static void bpf_overflow_handler(struct perf_event *event,
+@@ -9099,7 +9099,6 @@ static void bpf_overflow_handler(struct perf_event *event,
int ret = 0;
ctx.regs = perf_arch_bpf_user_pt_regs(regs);
@@ -13800,7 +13836,7 @@ index 875b3c27eab0..7b332babac3a 100644
if (unlikely(__this_cpu_inc_return(bpf_prog_active) != 1))
goto out;
rcu_read_lock();
-@@ -9013,7 +9012,6 @@ static void bpf_overflow_handler(struct perf_event *event,
+@@ -9107,7 +9106,6 @@ static void bpf_overflow_handler(struct perf_event *event,
rcu_read_unlock();
out:
__this_cpu_dec(bpf_prog_active);
@@ -13808,7 +13844,7 @@ index 875b3c27eab0..7b332babac3a 100644
if (!ret)
return;
-@@ -10305,7 +10303,7 @@ static struct pmu *perf_init_event(struct perf_event *event)
+@@ -10413,7 +10411,7 @@ static struct pmu *perf_init_event(struct perf_event *event)
goto unlock;
}
@@ -13818,7 +13854,7 @@ index 875b3c27eab0..7b332babac3a 100644
if (!ret)
goto unlock;
diff --git a/kernel/exit.c b/kernel/exit.c
-index c764d16328f6..7dcf44e3636a 100644
+index 56d3a099825f..ec404c4dbcd4 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -208,7 +208,7 @@ static void __exit_signal(struct task_struct *tsk)
@@ -14372,10 +14408,10 @@ index 45452facff3b..fa253e0db751 100644
obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
obj-$(CONFIG_WW_MUTEX_SELFTEST) += test-ww_mutex.o
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 0d9ff8b621e6..f5908f9d85a1 100644
+index 7cc790a262de..d3300ae01a37 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
-@@ -4531,6 +4531,7 @@ static void check_flags(unsigned long flags)
+@@ -4548,6 +4548,7 @@ static void check_flags(unsigned long flags)
}
}
@@ -14383,7 +14419,7 @@ index 0d9ff8b621e6..f5908f9d85a1 100644
/*
* We dont accurately track softirq state in e.g.
* hardirq contexts (such as on 4KSTACKS), so only
-@@ -4545,6 +4546,7 @@ static void check_flags(unsigned long flags)
+@@ -4562,6 +4563,7 @@ static void check_flags(unsigned long flags)
DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled);
}
}
@@ -14925,7 +14961,7 @@ index 364d38a0c444..e4a4a56037bb 100644
/*
* Once this completes (at least one RCU-sched grace period hence) the
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
-index 734698aec5f9..b9895b574a57 100644
+index 7c727c4944e6..5bf60f282ea0 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -8,6 +8,11 @@
@@ -15587,7 +15623,7 @@ index 734698aec5f9..b9895b574a57 100644
if (ret)
break;
}
-@@ -1223,33 +1631,104 @@ static void rt_mutex_handle_deadlock(int res, int detect_deadlock,
+@@ -1225,33 +1633,104 @@ static void rt_mutex_handle_deadlock(int res, int detect_deadlock,
}
}
@@ -15711,7 +15747,7 @@ index 734698aec5f9..b9895b574a57 100644
return 0;
}
-@@ -1259,16 +1738,26 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
+@@ -1261,16 +1740,26 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
if (unlikely(timeout))
hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS);
@@ -15733,17 +15769,17 @@ index 734698aec5f9..b9895b574a57 100644
if (unlikely(ret)) {
__set_current_state(TASK_RUNNING);
- remove_waiter(lock, &waiter);
-- rt_mutex_handle_deadlock(ret, chwalk, &waiter);
+- rt_mutex_handle_deadlock(ret, chwalk, lock, &waiter);
+ remove_waiter(lock, waiter);
+ /* ww_mutex wants to report EDEADLK/EALREADY, let it */
+ if (!ww_ctx)
-+ rt_mutex_handle_deadlock(ret, chwalk, waiter);
++ rt_mutex_handle_deadlock(ret, chwalk, lock, waiter);
+ } else if (ww_ctx) {
+ ww_mutex_account_lock(lock, ww_ctx);
}
/*
-@@ -1276,6 +1765,36 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
+@@ -1278,6 +1767,36 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
* unconditionally. We might have to fix that up.
*/
fixup_rt_mutex_waiters(lock);
@@ -15780,7 +15816,7 @@ index 734698aec5f9..b9895b574a57 100644
raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-@@ -1336,7 +1855,8 @@ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock)
+@@ -1338,7 +1857,8 @@ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock)
* Return whether the current task needs to call rt_mutex_postunlock().
*/
static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
@@ -15790,7 +15826,7 @@ index 734698aec5f9..b9895b574a57 100644
{
unsigned long flags;
-@@ -1390,7 +1910,7 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
+@@ -1392,7 +1912,7 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
*
* Queue the next waiter for wakeup once we release the wait_lock.
*/
@@ -15799,7 +15835,7 @@ index 734698aec5f9..b9895b574a57 100644
raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
return true; /* call rt_mutex_postunlock() */
-@@ -1404,29 +1924,45 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
+@@ -1406,29 +1926,45 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
*/
static inline int
rt_mutex_fastlock(struct rt_mutex *lock, int state,
@@ -15849,7 +15885,7 @@ index 734698aec5f9..b9895b574a57 100644
}
static inline int
-@@ -1442,9 +1978,11 @@ rt_mutex_fasttrylock(struct rt_mutex *lock,
+@@ -1444,9 +1980,11 @@ rt_mutex_fasttrylock(struct rt_mutex *lock,
/*
* Performs the wakeup of the the top-waiter and re-enables preemption.
*/
@@ -15862,7 +15898,7 @@ index 734698aec5f9..b9895b574a57 100644
/* Pairs with preempt_disable() in rt_mutex_slowunlock() */
preempt_enable();
-@@ -1453,23 +1991,46 @@ void rt_mutex_postunlock(struct wake_q_head *wake_q)
+@@ -1455,23 +1993,46 @@ void rt_mutex_postunlock(struct wake_q_head *wake_q)
static inline void
rt_mutex_fastunlock(struct rt_mutex *lock,
bool (*slowfn)(struct rt_mutex *lock,
@@ -15914,7 +15950,7 @@ index 734698aec5f9..b9895b574a57 100644
}
#ifdef CONFIG_DEBUG_LOCK_ALLOC
-@@ -1510,16 +2071,7 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock);
+@@ -1512,16 +2073,7 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock);
*/
int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock)
{
@@ -15932,7 +15968,7 @@ index 734698aec5f9..b9895b574a57 100644
}
EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible);
-@@ -1536,6 +2088,22 @@ int __sched __rt_mutex_futex_trylock(struct rt_mutex *lock)
+@@ -1538,6 +2090,22 @@ int __sched __rt_mutex_futex_trylock(struct rt_mutex *lock)
return __rt_mutex_slowtrylock(lock);
}
@@ -15955,7 +15991,7 @@ index 734698aec5f9..b9895b574a57 100644
/**
* rt_mutex_timed_lock - lock a rt_mutex interruptible
* the timeout structure is provided
-@@ -1559,6 +2127,7 @@ rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout)
+@@ -1561,6 +2129,7 @@ rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout)
mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
ret = rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
RT_MUTEX_MIN_CHAINWALK,
@@ -15963,7 +15999,7 @@ index 734698aec5f9..b9895b574a57 100644
rt_mutex_slowlock);
if (ret)
mutex_release(&lock->dep_map, 1, _RET_IP_);
-@@ -1567,6 +2136,18 @@ rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout)
+@@ -1569,6 +2138,18 @@ rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout)
}
EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
@@ -15982,7 +16018,7 @@ index 734698aec5f9..b9895b574a57 100644
/**
* rt_mutex_trylock - try to lock a rt_mutex
*
-@@ -1582,10 +2163,7 @@ int __sched rt_mutex_trylock(struct rt_mutex *lock)
+@@ -1584,10 +2165,7 @@ int __sched rt_mutex_trylock(struct rt_mutex *lock)
{
int ret;
@@ -15994,7 +16030,7 @@ index 734698aec5f9..b9895b574a57 100644
if (ret)
mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
-@@ -1593,6 +2171,11 @@ int __sched rt_mutex_trylock(struct rt_mutex *lock)
+@@ -1595,6 +2173,11 @@ int __sched rt_mutex_trylock(struct rt_mutex *lock)
}
EXPORT_SYMBOL_GPL(rt_mutex_trylock);
@@ -16006,7 +16042,7 @@ index 734698aec5f9..b9895b574a57 100644
/**
* rt_mutex_unlock - unlock a rt_mutex
*
-@@ -1601,16 +2184,13 @@ EXPORT_SYMBOL_GPL(rt_mutex_trylock);
+@@ -1603,16 +2186,13 @@ EXPORT_SYMBOL_GPL(rt_mutex_trylock);
void __sched rt_mutex_unlock(struct rt_mutex *lock)
{
mutex_release(&lock->dep_map, 1, _RET_IP_);
@@ -16027,7 +16063,7 @@ index 734698aec5f9..b9895b574a57 100644
{
lockdep_assert_held(&lock->wait_lock);
-@@ -1627,23 +2207,35 @@ bool __sched __rt_mutex_futex_unlock(struct rt_mutex *lock,
+@@ -1629,23 +2209,35 @@ bool __sched __rt_mutex_futex_unlock(struct rt_mutex *lock,
* avoid inversion prior to the wakeup. preempt_disable()
* therein pairs with rt_mutex_postunlock().
*/
@@ -16066,7 +16102,7 @@ index 734698aec5f9..b9895b574a57 100644
}
/**
-@@ -1682,7 +2274,7 @@ void __rt_mutex_init(struct rt_mutex *lock, const char *name,
+@@ -1684,7 +2276,7 @@ void __rt_mutex_init(struct rt_mutex *lock, const char *name,
if (name && key)
debug_rt_mutex_init(lock, name, key);
}
@@ -16075,7 +16111,7 @@ index 734698aec5f9..b9895b574a57 100644
/**
* rt_mutex_init_proxy_locked - initialize and lock a rt_mutex on behalf of a
-@@ -1702,6 +2294,14 @@ void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
+@@ -1704,6 +2296,14 @@ void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
struct task_struct *proxy_owner)
{
__rt_mutex_init(lock, NULL, NULL);
@@ -16090,7 +16126,7 @@ index 734698aec5f9..b9895b574a57 100644
debug_rt_mutex_proxy_lock(lock, proxy_owner);
rt_mutex_set_owner(lock, proxy_owner);
}
-@@ -1724,6 +2324,26 @@ void rt_mutex_proxy_unlock(struct rt_mutex *lock)
+@@ -1726,6 +2326,26 @@ void rt_mutex_proxy_unlock(struct rt_mutex *lock)
rt_mutex_set_owner(lock, NULL);
}
@@ -16117,7 +16153,7 @@ index 734698aec5f9..b9895b574a57 100644
/**
* __rt_mutex_start_proxy_lock() - Start lock acquisition for another task
* @lock: the rt_mutex to take
-@@ -1754,6 +2374,34 @@ int __rt_mutex_start_proxy_lock(struct rt_mutex *lock,
+@@ -1756,6 +2376,34 @@ int __rt_mutex_start_proxy_lock(struct rt_mutex *lock,
if (try_to_take_rt_mutex(lock, task, NULL))
return 1;
@@ -16152,7 +16188,7 @@ index 734698aec5f9..b9895b574a57 100644
/* We enforce deadlock detection for futexes */
ret = task_blocks_on_rt_mutex(lock, waiter, task,
RT_MUTEX_FULL_CHAINWALK);
-@@ -1768,6 +2416,9 @@ int __rt_mutex_start_proxy_lock(struct rt_mutex *lock,
+@@ -1770,6 +2418,9 @@ int __rt_mutex_start_proxy_lock(struct rt_mutex *lock,
ret = 0;
}
@@ -16162,7 +16198,7 @@ index 734698aec5f9..b9895b574a57 100644
debug_rt_mutex_print_deadlock(waiter);
return ret;
-@@ -1853,12 +2504,15 @@ int rt_mutex_wait_proxy_lock(struct rt_mutex *lock,
+@@ -1855,12 +2506,15 @@ int rt_mutex_wait_proxy_lock(struct rt_mutex *lock,
raw_spin_lock_irq(&lock->wait_lock);
/* sleep on the mutex */
set_current_state(TASK_INTERRUPTIBLE);
@@ -16179,7 +16215,7 @@ index 734698aec5f9..b9895b574a57 100644
raw_spin_unlock_irq(&lock->wait_lock);
return ret;
-@@ -1920,3 +2574,99 @@ bool rt_mutex_cleanup_proxy_lock(struct rt_mutex *lock,
+@@ -1922,3 +2576,99 @@ bool rt_mutex_cleanup_proxy_lock(struct rt_mutex *lock,
return cleanup;
}
@@ -17210,7 +17246,7 @@ index 472dd462a40c..82915146c92c 100644
+
+#endif
diff --git a/kernel/panic.c b/kernel/panic.c
-index cef79466f941..820da9858417 100644
+index 5559a6e4c457..c84ea2b05d21 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -301,7 +301,6 @@ void panic(const char *fmt, ...)
@@ -17230,7 +17266,7 @@ index cef79466f941..820da9858417 100644
kmsg_dump(KMSG_DUMP_PANIC);
/*
-@@ -588,9 +585,11 @@ static u64 oops_id;
+@@ -596,9 +593,11 @@ static u64 oops_id;
static int init_oops_id(void)
{
@@ -17330,7 +17366,7 @@ index b2b0f526f249..000000000000
-static inline bool printk_percpu_data_ready(void) { return false; }
-#endif /* CONFIG_PRINTK */
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index bb2198b40756..012d07cbabc6 100644
+index ae1a97dd0c3c..012d07cbabc6 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -45,6 +45,9 @@
@@ -18533,7 +18569,7 @@ index bb2198b40756..012d07cbabc6 100644
return error;
}
-@@ -1650,144 +1659,128 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
+@@ -1650,150 +1659,128 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
return do_syslog(type, buf, len, SYSLOG_FROM_READER);
}
@@ -18756,11 +18792,16 @@ index bb2198b40756..012d07cbabc6 100644
+ con->printk_seq = seq;
+ }
-- return 1;
+- /*
+- * Update @console_may_schedule for trylock because the previous
+- * owner may have been schedulable.
+- */
+- console_may_schedule = 0;
+ msg = (struct printk_log *)buf;
+ format_text(msg, master_seq, ext_text, &ext_len, text,
+ &len, time);
-+
+
+- return 1;
+ if (len == 0 && ext_len == 0)
+ continue;
+
@@ -18779,7 +18820,7 @@ index bb2198b40756..012d07cbabc6 100644
}
/*
-@@ -1795,8 +1788,9 @@ static int console_trylock_spinning(void)
+@@ -1801,8 +1788,9 @@ static int console_trylock_spinning(void)
* log_buf[start] to log_buf[end - 1].
* The console_lock must be held.
*/
@@ -18791,7 +18832,7 @@ index bb2198b40756..012d07cbabc6 100644
{
struct console *con;
-@@ -1806,15 +1800,40 @@ static void call_console_drivers(const char *ext_text, size_t ext_len,
+@@ -1812,15 +1800,40 @@ static void call_console_drivers(const char *ext_text, size_t ext_len,
return;
for_each_console(con) {
@@ -18835,7 +18876,7 @@ index bb2198b40756..012d07cbabc6 100644
if (con->flags & CON_EXTENDED)
con->write(con, ext_text, ext_len);
else
-@@ -1822,20 +1841,6 @@ static void call_console_drivers(const char *ext_text, size_t ext_len,
+@@ -1828,20 +1841,6 @@ static void call_console_drivers(const char *ext_text, size_t ext_len,
}
}
@@ -18856,7 +18897,7 @@ index bb2198b40756..012d07cbabc6 100644
static inline u32 printk_caller_id(void)
{
return in_task() ? task_pid_nr(current) :
-@@ -1852,101 +1857,95 @@ static struct cont {
+@@ -1858,101 +1857,95 @@ static struct cont {
char buf[LOG_LINE_MAX];
size_t len; /* length == 0 means unused buffer */
u32 caller_id; /* printk_caller_id() of first print */
@@ -19014,7 +19055,7 @@ index bb2198b40756..012d07cbabc6 100644
if (text_len && text[text_len-1] == '\n') {
text_len--;
lflags |= LOG_NEWLINE;
-@@ -1977,62 +1976,37 @@ int vprintk_store(int facility, int level,
+@@ -1983,62 +1976,37 @@ int vprintk_store(int facility, int level,
if (dict)
lflags |= LOG_NEWLINE;
@@ -19100,7 +19141,7 @@ index bb2198b40756..012d07cbabc6 100644
asmlinkage int vprintk(const char *fmt, va_list args)
{
return vprintk_func(fmt, args);
-@@ -2089,39 +2063,6 @@ asmlinkage __visible int printk(const char *fmt, ...)
+@@ -2095,39 +2063,6 @@ asmlinkage __visible int printk(const char *fmt, ...)
return r;
}
EXPORT_SYMBOL(printk);
@@ -19140,7 +19181,7 @@ index bb2198b40756..012d07cbabc6 100644
#endif /* CONFIG_PRINTK */
#ifdef CONFIG_EARLY_PRINTK
-@@ -2362,187 +2303,23 @@ int is_console_locked(void)
+@@ -2368,187 +2303,23 @@ int is_console_locked(void)
}
EXPORT_SYMBOL(is_console_locked);
@@ -19328,7 +19369,7 @@ index bb2198b40756..012d07cbabc6 100644
}
EXPORT_SYMBOL(console_unlock);
-@@ -2593,24 +2370,10 @@ void console_unblank(void)
+@@ -2599,24 +2370,10 @@ void console_unblank(void)
void console_flush_on_panic(enum con_flush_mode mode)
{
/*
@@ -19356,7 +19397,7 @@ index bb2198b40756..012d07cbabc6 100644
}
/*
-@@ -2688,7 +2451,6 @@ early_param("keep_bootcon", keep_bootcon_setup);
+@@ -2694,7 +2451,6 @@ early_param("keep_bootcon", keep_bootcon_setup);
void register_console(struct console *newcon)
{
int i;
@@ -19364,7 +19405,7 @@ index bb2198b40756..012d07cbabc6 100644
struct console *bcon = NULL;
struct console_cmdline *c;
static bool has_preferred;
-@@ -2804,27 +2566,6 @@ void register_console(struct console *newcon)
+@@ -2810,27 +2566,6 @@ void register_console(struct console *newcon)
if (newcon->flags & CON_EXTENDED)
nr_ext_console_drivers++;
@@ -19392,7 +19433,7 @@ index bb2198b40756..012d07cbabc6 100644
console_unlock();
console_sysfs_notify();
-@@ -2834,6 +2575,10 @@ void register_console(struct console *newcon)
+@@ -2840,6 +2575,10 @@ void register_console(struct console *newcon)
* boot consoles, real consoles, etc - this is to ensure that end
* users know there might be something in the kernel's log buffer that
* went to the bootconsole (that they do not see on the real console)
@@ -19403,7 +19444,7 @@ index bb2198b40756..012d07cbabc6 100644
*/
pr_info("%sconsole [%s%d] enabled\n",
(newcon->flags & CON_BOOT) ? "boot" : "" ,
-@@ -2977,65 +2722,75 @@ static int __init printk_late_init(void)
+@@ -2983,65 +2722,75 @@ static int __init printk_late_init(void)
late_initcall(printk_late_init);
#if defined CONFIG_PRINTK
@@ -19524,7 +19565,7 @@ index bb2198b40756..012d07cbabc6 100644
}
int printk_deferred(const char *fmt, ...)
-@@ -3157,8 +2912,8 @@ module_param_named(always_kmsg_dump, always_kmsg_dump, bool, S_IRUGO | S_IWUSR);
+@@ -3163,8 +2912,8 @@ module_param_named(always_kmsg_dump, always_kmsg_dump, bool, S_IRUGO | S_IWUSR);
*/
void kmsg_dump(enum kmsg_dump_reason reason)
{
@@ -19534,7 +19575,7 @@ index bb2198b40756..012d07cbabc6 100644
if ((reason > KMSG_DUMP_OOPS) && !always_kmsg_dump)
return;
-@@ -3168,21 +2923,18 @@ void kmsg_dump(enum kmsg_dump_reason reason)
+@@ -3174,21 +2923,18 @@ void kmsg_dump(enum kmsg_dump_reason reason)
if (dumper->max_reason && reason > dumper->max_reason)
continue;
@@ -19565,7 +19606,7 @@ index bb2198b40756..012d07cbabc6 100644
}
rcu_read_unlock();
}
-@@ -3209,33 +2961,67 @@ void kmsg_dump(enum kmsg_dump_reason reason)
+@@ -3215,33 +2961,67 @@ void kmsg_dump(enum kmsg_dump_reason reason)
bool kmsg_dump_get_line_nolock(struct kmsg_dumper *dumper, bool syslog,
char *line, size_t size, size_t *len)
{
@@ -19648,7 +19689,7 @@ index bb2198b40756..012d07cbabc6 100644
}
/**
-@@ -3258,12 +3044,9 @@ bool kmsg_dump_get_line_nolock(struct kmsg_dumper *dumper, bool syslog,
+@@ -3264,12 +3044,9 @@ bool kmsg_dump_get_line_nolock(struct kmsg_dumper *dumper, bool syslog,
bool kmsg_dump_get_line(struct kmsg_dumper *dumper, bool syslog,
char *line, size_t size, size_t *len)
{
@@ -19661,7 +19702,7 @@ index bb2198b40756..012d07cbabc6 100644
return ret;
}
-@@ -3291,74 +3074,101 @@ EXPORT_SYMBOL_GPL(kmsg_dump_get_line);
+@@ -3297,74 +3074,101 @@ EXPORT_SYMBOL_GPL(kmsg_dump_get_line);
bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog,
char *buf, size_t size, size_t *len)
{
@@ -19815,7 +19856,7 @@ index bb2198b40756..012d07cbabc6 100644
}
EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer);
-@@ -3374,10 +3184,8 @@ EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer);
+@@ -3380,10 +3184,8 @@ EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer);
*/
void kmsg_dump_rewind_nolock(struct kmsg_dumper *dumper)
{
@@ -19828,7 +19869,7 @@ index bb2198b40756..012d07cbabc6 100644
}
/**
-@@ -3390,12 +3198,89 @@ void kmsg_dump_rewind_nolock(struct kmsg_dumper *dumper)
+@@ -3396,12 +3198,89 @@ void kmsg_dump_rewind_nolock(struct kmsg_dumper *dumper)
*/
void kmsg_dump_rewind(struct kmsg_dumper *dumper)
{
@@ -20426,7 +20467,7 @@ index 7644eda17d62..4d84057d9d1c 100644
between each callback, and (2) affinity or cgroups can be used
to force the kthreads to run on whatever set of CPUs is desired.
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
-index 3c9feca1eab1..a90d6981e1e4 100644
+index aef4d01c4f61..78abe10f89fa 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -60,10 +60,13 @@ MODULE_AUTHOR("Paul E. McKenney <paulmck@linux.ibm.com> and Josh Triplett <josh@
@@ -20573,7 +20614,7 @@ index 3c9feca1eab1..a90d6981e1e4 100644
return mask ?: RCUTORTURE_RDR_RCU;
}
-@@ -1725,7 +1793,7 @@ static void rcu_torture_fwd_cb_cr(struct rcu_head *rhp)
+@@ -1726,7 +1794,7 @@ static void rcu_torture_fwd_cb_cr(struct rcu_head *rhp)
// Give the scheduler a chance, even on nohz_full CPUs.
static void rcu_torture_fwd_prog_cond_resched(unsigned long iter)
{
@@ -21728,7 +21769,7 @@ index e83a3f8449f6..c56c315524ae 100644
wait->task = current;
if (list_empty(&wait->task_list))
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
-index e5ebaffc4fef..6b4b8c517a58 100644
+index fc0dcc812a07..6a529e541181 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -502,6 +502,7 @@ static int init_rootdomain(struct root_domain *rd)
@@ -21762,7 +21803,7 @@ index b2e1981663b8..1071a1a59675 100644
}
#endif /* CONFIG_SECCOMP_FILTER */
diff --git a/kernel/signal.c b/kernel/signal.c
-index 1f4293a107b4..4ed9cbe27829 100644
+index fae5a2adc9ec..537db1f102e8 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -20,6 +20,7 @@
@@ -21938,7 +21979,7 @@ index 1f4293a107b4..4ed9cbe27829 100644
if (q)
q->flags |= SIGQUEUE_PREALLOC;
-@@ -2197,16 +2286,8 @@ static void ptrace_stop(int exit_code, int why, int clear_code, kernel_siginfo_t
+@@ -2200,16 +2289,8 @@ static void ptrace_stop(int exit_code, int why, int clear_code, kernel_siginfo_t
if (gstop_done && ptrace_reparented(current))
do_notify_parent_cldstop(current, false, why);
@@ -21956,7 +21997,7 @@ index 1f4293a107b4..4ed9cbe27829 100644
cgroup_leave_frozen(true);
} else {
diff --git a/kernel/smp.c b/kernel/smp.c
-index be65b76cb803..8ae9476edaf9 100644
+index 76de88dc1699..accf6678dc26 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -395,22 +395,9 @@ int smp_call_function_any(const struct cpumask *mask,
@@ -22484,7 +22525,7 @@ index 998d50ee2d9b..9112fc79d24b 100644
wake_up_q(&wakeq);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 4f85f7ed42fc..bd725084a173 100644
+index 865e539c7354..e9cfab0576d8 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -212,6 +212,11 @@ static int proc_do_cad_pid(struct ctl_table *table, int write,
@@ -22499,7 +22540,7 @@ index 4f85f7ed42fc..bd725084a173 100644
#endif
#ifdef CONFIG_PRINTK
-@@ -1524,7 +1529,7 @@ static struct ctl_table vm_table[] = {
+@@ -1528,7 +1533,7 @@ static struct ctl_table vm_table[] = {
.data = &sysctl_compact_unevictable_allowed,
.maxlen = sizeof(int),
.mode = 0644,
@@ -22508,7 +22549,7 @@ index 4f85f7ed42fc..bd725084a173 100644
.extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_ONE,
},
-@@ -2620,6 +2625,28 @@ int proc_dointvec(struct ctl_table *table, int write,
+@@ -2624,6 +2629,28 @@ int proc_dointvec(struct ctl_table *table, int write,
return do_proc_dointvec(table, write, buffer, lenp, ppos, NULL, NULL);
}
@@ -22538,10 +22579,10 @@ index 4f85f7ed42fc..bd725084a173 100644
* proc_douintvec - read a vector of unsigned integers
* @table: the sysctl table
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
-index 8e3c9228aec9..d6924b6eaf94 100644
+index 2e4f136bdf6a..d2827aaf256f 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
-@@ -2048,6 +2048,38 @@ SYSCALL_DEFINE2(nanosleep_time32, struct old_timespec32 __user *, rqtp,
+@@ -2051,6 +2051,38 @@ SYSCALL_DEFINE2(nanosleep_time32, struct old_timespec32 __user *, rqtp,
}
#endif
@@ -22910,7 +22951,7 @@ index eacb0ca30193..4cdcdf7382b1 100644
const struct k_clock clock_process = {
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
-index 5093cff93273..422f24bcb262 100644
+index c7b9b1e4af7d..ff695f5e6a4a 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -273,6 +273,7 @@ static void nohz_full_kick_func(struct irq_work *work)
@@ -22938,10 +22979,10 @@ index 5093cff93273..422f24bcb262 100644
}
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
-index 16a2b62f5f74..86bb218d1df5 100644
+index 6e2dd83a93af..fb4028464dae 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
-@@ -1291,7 +1291,7 @@ static void del_timer_wait_running(struct timer_list *timer)
+@@ -1320,7 +1320,7 @@ static void del_timer_wait_running(struct timer_list *timer)
u32 tf;
tf = READ_ONCE(timer->flags);
@@ -22950,7 +22991,7 @@ index 16a2b62f5f74..86bb218d1df5 100644
struct timer_base *base = get_timer_base(tf);
/*
-@@ -1375,6 +1375,13 @@ int del_timer_sync(struct timer_list *timer)
+@@ -1406,6 +1406,13 @@ int timer_delete_sync(struct timer_list *timer)
*/
WARN_ON(in_irq() && !(timer->flags & TIMER_IRQSAFE));
@@ -22964,7 +23005,7 @@ index 16a2b62f5f74..86bb218d1df5 100644
do {
ret = try_to_del_timer_sync(timer);
-@@ -1797,6 +1804,8 @@ static __latent_entropy void run_timer_softirq(struct softirq_action *h)
+@@ -1827,6 +1834,8 @@ static __latent_entropy void run_timer_softirq(struct softirq_action *h)
{
struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
@@ -23011,10 +23052,10 @@ index 4a31763a8c5d..acac5941f825 100644
}
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index f9c64329ec15..14dd4bf0821e 100644
+index d084334193bd..e06eb46cdc18 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
-@@ -2381,6 +2381,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned short type,
+@@ -2393,6 +2393,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned short type,
struct task_struct *tsk = current;
entry->preempt_count = pc & 0xff;
@@ -23022,7 +23063,7 @@ index f9c64329ec15..14dd4bf0821e 100644
entry->pid = (tsk) ? tsk->pid : 0;
entry->type = type;
entry->flags =
-@@ -2392,8 +2393,11 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned short type,
+@@ -2404,8 +2405,11 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned short type,
((pc & NMI_MASK ) ? TRACE_FLAG_NMI : 0) |
((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) |
((pc & SOFTIRQ_OFFSET) ? TRACE_FLAG_SOFTIRQ : 0) |
@@ -23035,7 +23076,7 @@ index f9c64329ec15..14dd4bf0821e 100644
}
EXPORT_SYMBOL_GPL(tracing_generic_entry_update);
-@@ -3631,9 +3635,11 @@ static void print_lat_help_header(struct seq_file *m)
+@@ -3644,9 +3648,11 @@ static void print_lat_help_header(struct seq_file *m)
"# | / _----=> need-resched \n"
"# || / _---=> hardirq/softirq \n"
"# ||| / _--=> preempt-depth \n"
@@ -23050,7 +23091,7 @@ index f9c64329ec15..14dd4bf0821e 100644
}
static void print_event_info(struct trace_buffer *buf, struct seq_file *m)
-@@ -3669,11 +3675,12 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file
+@@ -3682,11 +3688,12 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file
seq_printf(m, "# %.*s _-----=> irqs-off\n", prec, space);
seq_printf(m, "# %.*s / _----=> need-resched\n", prec, space);
@@ -23068,7 +23109,7 @@ index f9c64329ec15..14dd4bf0821e 100644
}
void
-@@ -3707,6 +3714,8 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
+@@ -3720,6 +3727,8 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
"desktop",
#elif defined(CONFIG_PREEMPT)
"preempt",
@@ -23077,7 +23118,7 @@ index f9c64329ec15..14dd4bf0821e 100644
#else
"unknown",
#endif
-@@ -9060,7 +9069,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
+@@ -9106,7 +9115,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
tracing_off();
local_irq_save(flags);
@@ -23085,7 +23126,7 @@ index f9c64329ec15..14dd4bf0821e 100644
/* Simulate the iterator */
trace_init_global_iter(&iter);
-@@ -9137,7 +9145,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
+@@ -9183,7 +9191,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
atomic_dec(&per_cpu_ptr(iter.trace_buffer->data, cpu)->disabled);
}
atomic_dec(&dump_running);
@@ -23094,7 +23135,7 @@ index f9c64329ec15..14dd4bf0821e 100644
}
EXPORT_SYMBOL_GPL(ftrace_dump);
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
-index 21f85c0bd66e..6e03a12ca072 100644
+index 40644e06536c..8a6108edeaaf 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -126,6 +126,7 @@ struct kretprobe_trace_entry_head {
@@ -23114,7 +23155,7 @@ index 21f85c0bd66e..6e03a12ca072 100644
#define TRACE_BUF_SIZE 1024
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index 0c21da12b650..df193197f563 100644
+index 958789fe4cef..3b2b2eac5d10 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -182,6 +182,8 @@ static int trace_define_common_fields(void)
@@ -23230,7 +23271,7 @@ index 8e8551c8b285..8ca917f2cf0b 100644
EXPORT_SYMBOL(on_each_cpu_cond);
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index 856188b0681a..c97f71fa613f 100644
+index a2c4de2a1132..c6409f1374ce 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -146,7 +146,7 @@ enum {
@@ -24014,10 +24055,10 @@ index 8be59f84eaea..c6e083323d1b 100644
}
}
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
-index b0e4301d7495..c364470efbcb 100644
+index 358449383720..2669fd8416fb 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
-@@ -590,7 +590,10 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
+@@ -591,7 +591,10 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
struct debug_obj *obj;
unsigned long flags;
@@ -24994,7 +25035,7 @@ index fbdc5c70e487..55f540359c70 100644
select XARRAY_MULTI
help
diff --git a/mm/compaction.c b/mm/compaction.c
-index 7a2675dbf3cc..41753103b3de 100644
+index 138edfa834b9..be1666ef7bab 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1583,7 +1583,11 @@ typedef enum {
@@ -25431,7 +25472,7 @@ index d8cde7292bf9..4ee0dde910fd 100644
rcu_read_unlock();
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
-index 0140629b7cb2..def119639f70 100644
+index 5ac119509335..2c48edaa1827 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -63,6 +63,7 @@
@@ -25467,7 +25508,7 @@ index 0140629b7cb2..def119639f70 100644
}
void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val)
-@@ -2283,7 +2288,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
+@@ -2289,7 +2294,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
* as well as workers from this path always operate on the local
* per-cpu data. CPU up doesn't touch memcg_stock at all.
*/
@@ -25476,7 +25517,7 @@ index 0140629b7cb2..def119639f70 100644
for_each_online_cpu(cpu) {
struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu);
struct mem_cgroup *memcg;
-@@ -2304,7 +2309,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
+@@ -2310,7 +2315,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
schedule_work_on(cpu, &stock->work);
}
}
@@ -25485,7 +25526,7 @@ index 0140629b7cb2..def119639f70 100644
mutex_unlock(&percpu_charge_mutex);
}
-@@ -5580,12 +5585,12 @@ static int mem_cgroup_move_account(struct page *page,
+@@ -5589,12 +5594,12 @@ static int mem_cgroup_move_account(struct page *page,
ret = 0;
@@ -25500,7 +25541,7 @@ index 0140629b7cb2..def119639f70 100644
out_unlock:
unlock_page(page);
out:
-@@ -6641,10 +6646,10 @@ void mem_cgroup_commit_charge(struct page *page, struct mem_cgroup *memcg,
+@@ -6650,10 +6655,10 @@ void mem_cgroup_commit_charge(struct page *page, struct mem_cgroup *memcg,
commit_charge(page, memcg, lrucare);
@@ -25513,7 +25554,7 @@ index 0140629b7cb2..def119639f70 100644
if (do_memsw_account() && PageSwapCache(page)) {
swp_entry_t entry = { .val = page_private(page) };
-@@ -6713,7 +6718,7 @@ static void uncharge_batch(const struct uncharge_gather *ug)
+@@ -6722,7 +6727,7 @@ static void uncharge_batch(const struct uncharge_gather *ug)
memcg_oom_recover(ug->memcg);
}
@@ -25522,7 +25563,7 @@ index 0140629b7cb2..def119639f70 100644
__mod_memcg_state(ug->memcg, MEMCG_RSS, -ug->nr_anon);
__mod_memcg_state(ug->memcg, MEMCG_CACHE, -ug->nr_file);
__mod_memcg_state(ug->memcg, MEMCG_RSS_HUGE, -ug->nr_huge);
-@@ -6721,7 +6726,7 @@ static void uncharge_batch(const struct uncharge_gather *ug)
+@@ -6730,7 +6735,7 @@ static void uncharge_batch(const struct uncharge_gather *ug)
__count_memcg_events(ug->memcg, PGPGOUT, ug->pgpgout);
__this_cpu_add(ug->memcg->vmstats_percpu->nr_page_events, nr_pages);
memcg_check_events(ug->memcg, ug->dummy_page);
@@ -25531,7 +25572,7 @@ index 0140629b7cb2..def119639f70 100644
if (!mem_cgroup_is_root(ug->memcg))
css_put_many(&ug->memcg->css, nr_pages);
-@@ -6884,10 +6889,10 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
+@@ -6893,10 +6898,10 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
commit_charge(newpage, memcg, false);
@@ -25544,7 +25585,7 @@ index 0140629b7cb2..def119639f70 100644
}
DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);
-@@ -7069,6 +7074,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
+@@ -7078,6 +7083,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
struct mem_cgroup *memcg, *swap_memcg;
unsigned int nr_entries;
unsigned short oldid;
@@ -25552,7 +25593,7 @@ index 0140629b7cb2..def119639f70 100644
VM_BUG_ON_PAGE(PageLRU(page), page);
VM_BUG_ON_PAGE(page_count(page), page);
-@@ -7114,10 +7120,14 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
+@@ -7123,10 +7129,14 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
* important here to have the interrupts disabled because it is the
* only synchronisation we have for updating the per-CPU variables.
*/
@@ -25568,10 +25609,10 @@ index 0140629b7cb2..def119639f70 100644
if (!mem_cgroup_is_root(memcg))
css_put_many(&memcg->css, nr_entries);
diff --git a/mm/memory.c b/mm/memory.c
-index d416e329442d..a1b06bc3a7e6 100644
+index 3cde782d2856..0dc9de1ed870 100644
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -2169,7 +2169,7 @@ static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd,
+@@ -2200,7 +2200,7 @@ static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd,
pte_t *page_table, pte_t orig_pte)
{
int same = 1;
@@ -25581,7 +25622,7 @@ index d416e329442d..a1b06bc3a7e6 100644
spinlock_t *ptl = pte_lockptr(mm, pmd);
spin_lock(ptl);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index a3fca320e35a..9e55d8137fc6 100644
+index 0ad582945f54..c599edc1352d 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -61,6 +61,7 @@
@@ -25938,7 +25979,7 @@ index a3fca320e35a..9e55d8137fc6 100644
return NULL;
}
-@@ -5830,7 +5905,6 @@ static void __build_all_zonelists(void *data)
+@@ -5832,7 +5907,6 @@ static void __build_all_zonelists(void *data)
* tty_insert_flip_string_and_push_buffer() on other CPU might be
* calling kmalloc(GFP_ATOMIC | __GFP_NOWARN) with port->lock held.
*/
@@ -25946,7 +25987,7 @@ index a3fca320e35a..9e55d8137fc6 100644
write_seqlock(&zonelist_update_seq);
#ifdef CONFIG_NUMA
-@@ -5865,7 +5939,6 @@ static void __build_all_zonelists(void *data)
+@@ -5867,7 +5941,6 @@ static void __build_all_zonelists(void *data)
}
write_sequnlock(&zonelist_update_seq);
@@ -25954,7 +25995,7 @@ index a3fca320e35a..9e55d8137fc6 100644
local_irq_restore(flags);
}
-@@ -7704,8 +7777,9 @@ void __init free_area_init(unsigned long *zones_size)
+@@ -7706,8 +7779,9 @@ void __init free_area_init(unsigned long *zones_size)
static int page_alloc_cpu_dead(unsigned int cpu)
{
@@ -25965,7 +26006,7 @@ index a3fca320e35a..9e55d8137fc6 100644
drain_pages(cpu);
/*
-@@ -8642,7 +8716,7 @@ void zone_pcp_reset(struct zone *zone)
+@@ -8644,7 +8718,7 @@ void zone_pcp_reset(struct zone *zone)
struct per_cpu_pageset *pset;
/* avoid races with drain_pages() */
@@ -25974,7 +26015,7 @@ index a3fca320e35a..9e55d8137fc6 100644
if (zone->pageset != &boot_pageset) {
for_each_online_cpu(cpu) {
pset = per_cpu_ptr(zone->pageset, cpu);
-@@ -8651,7 +8725,7 @@ void zone_pcp_reset(struct zone *zone)
+@@ -8653,7 +8727,7 @@ void zone_pcp_reset(struct zone *zone)
free_percpu(zone->pageset);
zone->pageset = &boot_pageset;
}
@@ -27606,7 +27647,7 @@ index 48ed37cdd22f..3b88d028c7d5 100644
config BQL
bool
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
-index e67310a749d2..69fe302fcf62 100644
+index 5d8dda9ec518..fc17b9d2d317 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -64,15 +64,13 @@ static void rfcomm_sk_data_ready(struct rfcomm_dlc *d, struct sk_buff *skb)
@@ -27672,7 +27713,7 @@ index 591d146a5308..dbf8fdcebc53 100644
do_div(time_spent, repeat);
diff --git a/net/core/dev.c b/net/core/dev.c
-index a381e87fb380..de2df6c750f0 100644
+index b75c9bebd5c6..1aed6c43ac03 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -218,14 +218,14 @@ static inline struct hlist_head *dev_index_hash(struct net *net, int ifindex)
@@ -27708,7 +27749,7 @@ index a381e87fb380..de2df6c750f0 100644
}
EXPORT_SYMBOL(__dev_kfree_skb_irq);
-@@ -3410,7 +3412,11 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
+@@ -3437,7 +3439,11 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
* This permits qdisc->running owner to get the lock more
* often and dequeue packets faster.
*/
@@ -27720,7 +27761,7 @@ index a381e87fb380..de2df6c750f0 100644
if (unlikely(contended))
spin_lock(&q->busylock);
-@@ -4213,6 +4219,7 @@ static int enqueue_to_backlog(struct sk_buff *skb, int cpu,
+@@ -4240,6 +4246,7 @@ static int enqueue_to_backlog(struct sk_buff *skb, int cpu,
rps_unlock(sd);
local_irq_restore(flags);
@@ -27728,7 +27769,7 @@ index a381e87fb380..de2df6c750f0 100644
atomic_long_inc(&skb->dev->rx_dropped);
kfree_skb(skb);
-@@ -4427,7 +4434,7 @@ static int netif_rx_internal(struct sk_buff *skb)
+@@ -4454,7 +4461,7 @@ static int netif_rx_internal(struct sk_buff *skb)
struct rps_dev_flow voidflow, *rflow = &voidflow;
int cpu;
@@ -27737,7 +27778,7 @@ index a381e87fb380..de2df6c750f0 100644
rcu_read_lock();
cpu = get_rps_cpu(skb->dev, skb, &rflow);
-@@ -4437,14 +4444,14 @@ static int netif_rx_internal(struct sk_buff *skb)
+@@ -4464,14 +4471,14 @@ static int netif_rx_internal(struct sk_buff *skb)
ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
rcu_read_unlock();
@@ -27755,7 +27796,7 @@ index a381e87fb380..de2df6c750f0 100644
}
return ret;
}
-@@ -4483,11 +4490,9 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -4510,11 +4517,9 @@ int netif_rx_ni(struct sk_buff *skb)
trace_netif_rx_ni_entry(skb);
@@ -27769,7 +27810,7 @@ index a381e87fb380..de2df6c750f0 100644
trace_netif_rx_ni_exit(err);
return err;
-@@ -5868,12 +5873,14 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
+@@ -5895,12 +5900,14 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
sd->rps_ipi_list = NULL;
local_irq_enable();
@@ -27784,7 +27825,7 @@ index a381e87fb380..de2df6c750f0 100644
}
static bool sd_has_rps_ipi_waiting(struct softnet_data *sd)
-@@ -5903,7 +5910,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
+@@ -5930,7 +5937,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
while (again) {
struct sk_buff *skb;
@@ -27794,7 +27835,7 @@ index a381e87fb380..de2df6c750f0 100644
rcu_read_lock();
__netif_receive_skb(skb);
rcu_read_unlock();
-@@ -5911,9 +5920,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
+@@ -5938,9 +5947,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
if (++work >= quota)
return work;
@@ -27805,7 +27846,7 @@ index a381e87fb380..de2df6c750f0 100644
rps_lock(sd);
if (skb_queue_empty(&sd->input_pkt_queue)) {
/*
-@@ -5951,6 +5960,7 @@ void __napi_schedule(struct napi_struct *n)
+@@ -5978,6 +5987,7 @@ void __napi_schedule(struct napi_struct *n)
local_irq_save(flags);
____napi_schedule(this_cpu_ptr(&softnet_data), n);
local_irq_restore(flags);
@@ -27813,7 +27854,7 @@ index a381e87fb380..de2df6c750f0 100644
}
EXPORT_SYMBOL(__napi_schedule);
-@@ -6402,13 +6412,21 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)
+@@ -6429,13 +6439,21 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)
unsigned long time_limit = jiffies +
usecs_to_jiffies(READ_ONCE(netdev_budget_usecs));
int budget = READ_ONCE(netdev_budget);
@@ -27835,7 +27876,7 @@ index a381e87fb380..de2df6c750f0 100644
for (;;) {
struct napi_struct *n;
-@@ -9957,6 +9975,7 @@ static int dev_cpu_dead(unsigned int oldcpu)
+@@ -9984,6 +10002,7 @@ static int dev_cpu_dead(unsigned int oldcpu)
raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_enable();
@@ -27843,7 +27884,7 @@ index a381e87fb380..de2df6c750f0 100644
#ifdef CONFIG_RPS
remsd = oldsd->rps_ipi_list;
-@@ -9970,10 +9989,13 @@ static int dev_cpu_dead(unsigned int oldcpu)
+@@ -9997,10 +10016,13 @@ static int dev_cpu_dead(unsigned int oldcpu)
netif_rx_ni(skb);
input_queue_head_incr(oldsd);
}
@@ -27858,7 +27899,7 @@ index a381e87fb380..de2df6c750f0 100644
return 0;
}
-@@ -10284,8 +10306,9 @@ static int __init net_dev_init(void)
+@@ -10311,8 +10333,9 @@ static int __init net_dev_init(void)
INIT_WORK(flush, flush_backlog);
@@ -28007,7 +28048,7 @@ index a606ad8e8be2..b7911350f421 100644
* meaning skb_orphan has been called. We NULL sk on the way out
* to ensure we don't trigger a BUG_ON() in skb/sk operations
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c
-index 8a8ea7e6774d..5289edc4e6cf 100644
+index 50dceed77ba6..16bb28d32580 100644
--- a/net/kcm/kcmsock.c
+++ b/net/kcm/kcmsock.c
@@ -385,9 +385,7 @@ static int kcm_parse_func_strparser(struct strparser *strp, struct sk_buff *skb)
@@ -28022,7 +28063,7 @@ index 8a8ea7e6774d..5289edc4e6cf 100644
}
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index 0582abf5ab71..2a23820a53a4 100644
+index 88bc4a21dda4..e903b048c505 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -57,6 +57,7 @@
@@ -28033,7 +28074,7 @@ index 0582abf5ab71..2a23820a53a4 100644
#include <linux/kmod.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
-@@ -665,7 +666,7 @@ static void prb_retire_rx_blk_timer_expired(struct timer_list *t)
+@@ -720,7 +721,7 @@ static void prb_retire_rx_blk_timer_expired(struct timer_list *t)
if (BLOCK_NUM_PKTS(pbd)) {
while (atomic_read(&pkc->blk_fill_in_prog)) {
/* Waiting for skb_copy_bits to finish... */
@@ -28042,7 +28083,7 @@ index 0582abf5ab71..2a23820a53a4 100644
}
}
-@@ -927,7 +928,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *pkc,
+@@ -982,7 +983,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *pkc,
if (!(status & TP_STATUS_BLK_TMO)) {
while (atomic_read(&pkc->blk_fill_in_prog)) {
/* Waiting for skb_copy_bits to finish... */
@@ -28052,10 +28093,10 @@ index 0582abf5ab71..2a23820a53a4 100644
}
prb_close_block(pkc, pbd, po, status);
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
-index d07146a2d0bb..77f766048187 100644
+index b8dc03a7487e..c9d2fc3d8b59 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
-@@ -1266,7 +1266,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
+@@ -1271,7 +1271,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
rcu_assign_pointer(sch->stab, stab);
}
if (tca[TCA_RATE]) {
@@ -28189,7 +28230,7 @@ index 35a8295e8f3a..4cea4cdf6ac1 100644
#endif /* __AA_PATH_H */
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index 21e03380dd86..269ecd8ed8bb 100644
+index 4c69259b62f1..6cf2226f544a 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -44,7 +44,7 @@
@@ -28261,5 +28302,5 @@ index f7150fbeeb55..16501aee45b4 100644
ret = handle_exit(vcpu, run, ret);
}
--
-2.39.2
+2.47.2
diff --git a/patches/drivers/ti/firmware/0001-Add-AM335x-CM3-Power-Managment-Firmware.patch b/patches/external/ti-amx3-cm3-pm-firmware/0001-Add-AM335x-CM3-Power-Managment-Firmware.patch
similarity index 99%
rename from patches/drivers/ti/firmware/0001-Add-AM335x-CM3-Power-Managment-Firmware.patch
rename to patches/external/ti-amx3-cm3-pm-firmware/0001-Add-AM335x-CM3-Power-Managment-Firmware.patch
index f4cf711f6..32931539b 100644
--- a/patches/drivers/ti/firmware/0001-Add-AM335x-CM3-Power-Managment-Firmware.patch
+++ b/patches/external/ti-amx3-cm3-pm-firmware/0001-Add-AM335x-CM3-Power-Managment-Firmware.patch
@@ -1,6 +1,6 @@
-From 8e37d58ab678fccdf22a4f253e6b01fbc4ed10be Mon Sep 17 00:00:00 2001
+From 91e8915e6d01499b1aab1ef7c0c36385fb6d5b1b Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:42:52 -0500
+Date: Tue, 18 Jul 2023 16:29:06 -0500
Subject: [PATCH] Add AM335x CM3 Power Managment Firmware
http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=fb484c5e54f2e31cf0a338d2927a06a2870bcc2c
diff --git a/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch b/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch
index 71d1571c7..fdec666f0 100644
--- a/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch
+++ b/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch
@@ -1,10 +1,10 @@
-From acaf4789d5f7cd5ad8f413d15578649971b1fece Mon Sep 17 00:00:00 2001
+From 69d0077d15bc26891e0daa82c704ae656ea1ac6d Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 17 Nov 2023 15:58:24 -0600
+Date: Wed, 12 Feb 2025 13:34:51 -0600
Subject: [PATCH] merge: wpanusb:
https://git.beagleboard.org/beagleconnect/linux/wpanusb
-https://git.beagleboard.org/beagleconnect/linux/wpanusb/-/commit/6aa9bf65b9d88a2c9a111e7b4aed03de2be9413d
+https://openbeagle.org/beagleconnect/linux/wpanusb/-/commit/6aa9bf65b9d88a2c9a111e7b4aed03de2be9413d
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
drivers/net/ieee802154/wpanusb.c | 778 +++++++++++++++++++++++++++++++
@@ -857,5 +857,5 @@ index 000000000000..52e54fdca737
+ __le64 ieee_addr;
+} __packed;
--
-2.39.2
+2.47.2
diff --git a/patches/external/wpanusb/0002-Add-WPANUSB-driver.patch b/patches/external/wpanusb/0002-Add-WPANUSB-driver.patch
index d3dbae59f..1ffce10ef 100644
--- a/patches/external/wpanusb/0002-Add-WPANUSB-driver.patch
+++ b/patches/external/wpanusb/0002-Add-WPANUSB-driver.patch
@@ -11,7 +11,7 @@ https://github.com/statropy/wpanusb
2 files changed, 10 insertions(+)
diff --git a/drivers/net/ieee802154/Kconfig b/drivers/net/ieee802154/Kconfig
-index 8af5b7e9f4ed..05561d224441 100644
+index 6d1c83fe3e97..c310472d6714 100644
--- a/drivers/net/ieee802154/Kconfig
+++ b/drivers/net/ieee802154/Kconfig
@@ -73,6 +73,15 @@ config IEEE802154_ATUSB
@@ -28,8 +28,8 @@ index 8af5b7e9f4ed..05561d224441 100644
+ * BeagleBoard.org BeagleConnect Freedom
+
config IEEE802154_ADF7242
- tristate "ADF7242 transceiver driver"
- depends on IEEE802154_DRIVERS && MAC802154
+ tristate "ADF7242 transceiver driver"
+ depends on IEEE802154_DRIVERS && MAC802154
diff --git a/drivers/net/ieee802154/Makefile b/drivers/net/ieee802154/Makefile
index 0c78b6298060..59442aab9403 100644
--- a/drivers/net/ieee802154/Makefile
@@ -43,5 +43,5 @@ index 0c78b6298060..59442aab9403 100644
obj-$(CONFIG_IEEE802154_CA8210) += ca8210.o
obj-$(CONFIG_IEEE802154_MCR20A) += mcr20a.o
--
-2.29.2
+2.47.2
diff --git a/patches/fixes/gcc/13/0001-ata-ahci-fix-enum-constants-for-gcc-13.patch b/patches/fixes/gcc/13/0001-ata-ahci-fix-enum-constants-for-gcc-13.patch
deleted file mode 100644
index 2afc5b34e..000000000
--- a/patches/fixes/gcc/13/0001-ata-ahci-fix-enum-constants-for-gcc-13.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-From bcd9e528e2c8a2e91dfbebd289e1c44454e96f73 Mon Sep 17 00:00:00 2001
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Thu, 8 Jun 2023 23:13:34 +0100
-Subject: [PATCH] ata: ahci: fix enum constants for gcc-13
-
-commit f07788079f515ca4a681c5f595bdad19cfbd7b1d upstream.
-
-gcc-13 slightly changes the type of constant expressions that are defined
-in an enum, which triggers a compile time sanity check in libata:
-
-linux/drivers/ata/libahci.c: In function 'ahci_led_store':
-linux/include/linux/compiler_types.h:357:45: error: call to '__compiletime_assert_302' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long)
-357 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
-
-The new behavior is that sizeof() returns the same value for the
-constant as it does for the enum type, which is generally more sensible
-and consistent.
-
-The problem in libata is that it contains a single enum definition for
-lots of unrelated constants, some of which are large positive (unsigned)
-integers like 0xffffffff, while others like (1<<31) are interpreted as
-negative integers, and this forces the enum type to become 64 bit wide
-even though most constants would still fit into a signed 32-bit 'int'.
-
-Fix this by changing the entire enum definition to use BIT(x) in place
-of (1<<x), which results in all values being seen as 'unsigned' and
-fitting into an unsigned 32-bit type.
-
-Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107917
-Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107405
-Reported-by: Luis Machado <luis.machado@arm.com>
-Cc: linux-ide@vger.kernel.org
-Cc: Damien Le Moal <damien.lemoal@opensource.wdc.com>
-Cc: stable@vger.kernel.org
-Cc: Randy Dunlap <rdunlap@infradead.org>
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Tested-by: Luis Machado <luis.machado@arm.com>
-Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
-[ Modified to account for slight differences in the enum contents in the 5.10.y tree.]
-Signed-off-by: Paul Barker <paul.barker@sancloud.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/ata/ahci.h | 245 +++++++++++++++++++++++----------------------
- 1 file changed, 123 insertions(+), 122 deletions(-)
-
-diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
-index 1ce897356993..7cc6feb17e97 100644
---- a/drivers/ata/ahci.h
-+++ b/drivers/ata/ahci.h
-@@ -24,6 +24,7 @@
- #include <linux/libata.h>
- #include <linux/phy/phy.h>
- #include <linux/regulator/consumer.h>
-+#include <linux/bits.h>
-
- /* Enclosure Management Control */
- #define EM_CTRL_MSG_TYPE 0x000f0000
-@@ -54,12 +55,12 @@ enum {
- AHCI_PORT_PRIV_FBS_DMA_SZ = AHCI_CMD_SLOT_SZ +
- AHCI_CMD_TBL_AR_SZ +
- (AHCI_RX_FIS_SZ * 16),
-- AHCI_IRQ_ON_SG = (1 << 31),
-- AHCI_CMD_ATAPI = (1 << 5),
-- AHCI_CMD_WRITE = (1 << 6),
-- AHCI_CMD_PREFETCH = (1 << 7),
-- AHCI_CMD_RESET = (1 << 8),
-- AHCI_CMD_CLR_BUSY = (1 << 10),
-+ AHCI_IRQ_ON_SG = BIT(31),
-+ AHCI_CMD_ATAPI = BIT(5),
-+ AHCI_CMD_WRITE = BIT(6),
-+ AHCI_CMD_PREFETCH = BIT(7),
-+ AHCI_CMD_RESET = BIT(8),
-+ AHCI_CMD_CLR_BUSY = BIT(10),
-
- RX_FIS_PIO_SETUP = 0x20, /* offset of PIO Setup FIS data */
- RX_FIS_D2H_REG = 0x40, /* offset of D2H Register FIS data */
-@@ -77,37 +78,37 @@ enum {
- HOST_CAP2 = 0x24, /* host capabilities, extended */
-
- /* HOST_CTL bits */
-- HOST_RESET = (1 << 0), /* reset controller; self-clear */
-- HOST_IRQ_EN = (1 << 1), /* global IRQ enable */
-- HOST_MRSM = (1 << 2), /* MSI Revert to Single Message */
-- HOST_AHCI_EN = (1 << 31), /* AHCI enabled */
-+ HOST_RESET = BIT(0), /* reset controller; self-clear */
-+ HOST_IRQ_EN = BIT(1), /* global IRQ enable */
-+ HOST_MRSM = BIT(2), /* MSI Revert to Single Message */
-+ HOST_AHCI_EN = BIT(31), /* AHCI enabled */
-
- /* HOST_CAP bits */
-- HOST_CAP_SXS = (1 << 5), /* Supports External SATA */
-- HOST_CAP_EMS = (1 << 6), /* Enclosure Management support */
-- HOST_CAP_CCC = (1 << 7), /* Command Completion Coalescing */
-- HOST_CAP_PART = (1 << 13), /* Partial state capable */
-- HOST_CAP_SSC = (1 << 14), /* Slumber state capable */
-- HOST_CAP_PIO_MULTI = (1 << 15), /* PIO multiple DRQ support */
-- HOST_CAP_FBS = (1 << 16), /* FIS-based switching support */
-- HOST_CAP_PMP = (1 << 17), /* Port Multiplier support */
-- HOST_CAP_ONLY = (1 << 18), /* Supports AHCI mode only */
-- HOST_CAP_CLO = (1 << 24), /* Command List Override support */
-- HOST_CAP_LED = (1 << 25), /* Supports activity LED */
-- HOST_CAP_ALPM = (1 << 26), /* Aggressive Link PM support */
-- HOST_CAP_SSS = (1 << 27), /* Staggered Spin-up */
-- HOST_CAP_MPS = (1 << 28), /* Mechanical presence switch */
-- HOST_CAP_SNTF = (1 << 29), /* SNotification register */
-- HOST_CAP_NCQ = (1 << 30), /* Native Command Queueing */
-- HOST_CAP_64 = (1 << 31), /* PCI DAC (64-bit DMA) support */
-+ HOST_CAP_SXS = BIT(5), /* Supports External SATA */
-+ HOST_CAP_EMS = BIT(6), /* Enclosure Management support */
-+ HOST_CAP_CCC = BIT(7), /* Command Completion Coalescing */
-+ HOST_CAP_PART = BIT(13), /* Partial state capable */
-+ HOST_CAP_SSC = BIT(14), /* Slumber state capable */
-+ HOST_CAP_PIO_MULTI = BIT(15), /* PIO multiple DRQ support */
-+ HOST_CAP_FBS = BIT(16), /* FIS-based switching support */
-+ HOST_CAP_PMP = BIT(17), /* Port Multiplier support */
-+ HOST_CAP_ONLY = BIT(18), /* Supports AHCI mode only */
-+ HOST_CAP_CLO = BIT(24), /* Command List Override support */
-+ HOST_CAP_LED = BIT(25), /* Supports activity LED */
-+ HOST_CAP_ALPM = BIT(26), /* Aggressive Link PM support */
-+ HOST_CAP_SSS = BIT(27), /* Staggered Spin-up */
-+ HOST_CAP_MPS = BIT(28), /* Mechanical presence switch */
-+ HOST_CAP_SNTF = BIT(29), /* SNotification register */
-+ HOST_CAP_NCQ = BIT(30), /* Native Command Queueing */
-+ HOST_CAP_64 = BIT(31), /* PCI DAC (64-bit DMA) support */
-
- /* HOST_CAP2 bits */
-- HOST_CAP2_BOH = (1 << 0), /* BIOS/OS handoff supported */
-- HOST_CAP2_NVMHCI = (1 << 1), /* NVMHCI supported */
-- HOST_CAP2_APST = (1 << 2), /* Automatic partial to slumber */
-- HOST_CAP2_SDS = (1 << 3), /* Support device sleep */
-- HOST_CAP2_SADM = (1 << 4), /* Support aggressive DevSlp */
-- HOST_CAP2_DESO = (1 << 5), /* DevSlp from slumber only */
-+ HOST_CAP2_BOH = BIT(0), /* BIOS/OS handoff supported */
-+ HOST_CAP2_NVMHCI = BIT(1), /* NVMHCI supported */
-+ HOST_CAP2_APST = BIT(2), /* Automatic partial to slumber */
-+ HOST_CAP2_SDS = BIT(3), /* Support device sleep */
-+ HOST_CAP2_SADM = BIT(4), /* Support aggressive DevSlp */
-+ HOST_CAP2_DESO = BIT(5), /* DevSlp from slumber only */
-
- /* registers for each SATA port */
- PORT_LST_ADDR = 0x00, /* command list DMA addr */
-@@ -129,24 +130,24 @@ enum {
- PORT_DEVSLP = 0x44, /* device sleep */
-
- /* PORT_IRQ_{STAT,MASK} bits */
-- PORT_IRQ_COLD_PRES = (1 << 31), /* cold presence detect */
-- PORT_IRQ_TF_ERR = (1 << 30), /* task file error */
-- PORT_IRQ_HBUS_ERR = (1 << 29), /* host bus fatal error */
-- PORT_IRQ_HBUS_DATA_ERR = (1 << 28), /* host bus data error */
-- PORT_IRQ_IF_ERR = (1 << 27), /* interface fatal error */
-- PORT_IRQ_IF_NONFATAL = (1 << 26), /* interface non-fatal error */
-- PORT_IRQ_OVERFLOW = (1 << 24), /* xfer exhausted available S/G */
-- PORT_IRQ_BAD_PMP = (1 << 23), /* incorrect port multiplier */
--
-- PORT_IRQ_PHYRDY = (1 << 22), /* PhyRdy changed */
-- PORT_IRQ_DEV_ILCK = (1 << 7), /* device interlock */
-- PORT_IRQ_CONNECT = (1 << 6), /* port connect change status */
-- PORT_IRQ_SG_DONE = (1 << 5), /* descriptor processed */
-- PORT_IRQ_UNK_FIS = (1 << 4), /* unknown FIS rx'd */
-- PORT_IRQ_SDB_FIS = (1 << 3), /* Set Device Bits FIS rx'd */
-- PORT_IRQ_DMAS_FIS = (1 << 2), /* DMA Setup FIS rx'd */
-- PORT_IRQ_PIOS_FIS = (1 << 1), /* PIO Setup FIS rx'd */
-- PORT_IRQ_D2H_REG_FIS = (1 << 0), /* D2H Register FIS rx'd */
-+ PORT_IRQ_COLD_PRES = BIT(31), /* cold presence detect */
-+ PORT_IRQ_TF_ERR = BIT(30), /* task file error */
-+ PORT_IRQ_HBUS_ERR = BIT(29), /* host bus fatal error */
-+ PORT_IRQ_HBUS_DATA_ERR = BIT(28), /* host bus data error */
-+ PORT_IRQ_IF_ERR = BIT(27), /* interface fatal error */
-+ PORT_IRQ_IF_NONFATAL = BIT(26), /* interface non-fatal error */
-+ PORT_IRQ_OVERFLOW = BIT(24), /* xfer exhausted available S/G */
-+ PORT_IRQ_BAD_PMP = BIT(23), /* incorrect port multiplier */
-+
-+ PORT_IRQ_PHYRDY = BIT(22), /* PhyRdy changed */
-+ PORT_IRQ_DEV_ILCK = BIT(7), /* device interlock */
-+ PORT_IRQ_CONNECT = BIT(6), /* port connect change status */
-+ PORT_IRQ_SG_DONE = BIT(5), /* descriptor processed */
-+ PORT_IRQ_UNK_FIS = BIT(4), /* unknown FIS rx'd */
-+ PORT_IRQ_SDB_FIS = BIT(3), /* Set Device Bits FIS rx'd */
-+ PORT_IRQ_DMAS_FIS = BIT(2), /* DMA Setup FIS rx'd */
-+ PORT_IRQ_PIOS_FIS = BIT(1), /* PIO Setup FIS rx'd */
-+ PORT_IRQ_D2H_REG_FIS = BIT(0), /* D2H Register FIS rx'd */
-
- PORT_IRQ_FREEZE = PORT_IRQ_HBUS_ERR |
- PORT_IRQ_IF_ERR |
-@@ -162,34 +163,34 @@ enum {
- PORT_IRQ_PIOS_FIS | PORT_IRQ_D2H_REG_FIS,
-
- /* PORT_CMD bits */
-- PORT_CMD_ASP = (1 << 27), /* Aggressive Slumber/Partial */
-- PORT_CMD_ALPE = (1 << 26), /* Aggressive Link PM enable */
-- PORT_CMD_ATAPI = (1 << 24), /* Device is ATAPI */
-- PORT_CMD_FBSCP = (1 << 22), /* FBS Capable Port */
-- PORT_CMD_ESP = (1 << 21), /* External Sata Port */
-- PORT_CMD_HPCP = (1 << 18), /* HotPlug Capable Port */
-- PORT_CMD_PMP = (1 << 17), /* PMP attached */
-- PORT_CMD_LIST_ON = (1 << 15), /* cmd list DMA engine running */
-- PORT_CMD_FIS_ON = (1 << 14), /* FIS DMA engine running */
-- PORT_CMD_FIS_RX = (1 << 4), /* Enable FIS receive DMA engine */
-- PORT_CMD_CLO = (1 << 3), /* Command list override */
-- PORT_CMD_POWER_ON = (1 << 2), /* Power up device */
-- PORT_CMD_SPIN_UP = (1 << 1), /* Spin up device */
-- PORT_CMD_START = (1 << 0), /* Enable port DMA engine */
--
-- PORT_CMD_ICC_MASK = (0xf << 28), /* i/f ICC state mask */
-- PORT_CMD_ICC_ACTIVE = (0x1 << 28), /* Put i/f in active state */
-- PORT_CMD_ICC_PARTIAL = (0x2 << 28), /* Put i/f in partial state */
-- PORT_CMD_ICC_SLUMBER = (0x6 << 28), /* Put i/f in slumber state */
-+ PORT_CMD_ASP = BIT(27), /* Aggressive Slumber/Partial */
-+ PORT_CMD_ALPE = BIT(26), /* Aggressive Link PM enable */
-+ PORT_CMD_ATAPI = BIT(24), /* Device is ATAPI */
-+ PORT_CMD_FBSCP = BIT(22), /* FBS Capable Port */
-+ PORT_CMD_ESP = BIT(21), /* External Sata Port */
-+ PORT_CMD_HPCP = BIT(18), /* HotPlug Capable Port */
-+ PORT_CMD_PMP = BIT(17), /* PMP attached */
-+ PORT_CMD_LIST_ON = BIT(15), /* cmd list DMA engine running */
-+ PORT_CMD_FIS_ON = BIT(14), /* FIS DMA engine running */
-+ PORT_CMD_FIS_RX = BIT(4), /* Enable FIS receive DMA engine */
-+ PORT_CMD_CLO = BIT(3), /* Command list override */
-+ PORT_CMD_POWER_ON = BIT(2), /* Power up device */
-+ PORT_CMD_SPIN_UP = BIT(1), /* Spin up device */
-+ PORT_CMD_START = BIT(0), /* Enable port DMA engine */
-+
-+ PORT_CMD_ICC_MASK = (0xfu << 28), /* i/f ICC state mask */
-+ PORT_CMD_ICC_ACTIVE = (0x1u << 28), /* Put i/f in active state */
-+ PORT_CMD_ICC_PARTIAL = (0x2u << 28), /* Put i/f in partial state */
-+ PORT_CMD_ICC_SLUMBER = (0x6u << 28), /* Put i/f in slumber state */
-
- /* PORT_FBS bits */
- PORT_FBS_DWE_OFFSET = 16, /* FBS device with error offset */
- PORT_FBS_ADO_OFFSET = 12, /* FBS active dev optimization offset */
- PORT_FBS_DEV_OFFSET = 8, /* FBS device to issue offset */
- PORT_FBS_DEV_MASK = (0xf << PORT_FBS_DEV_OFFSET), /* FBS.DEV */
-- PORT_FBS_SDE = (1 << 2), /* FBS single device error */
-- PORT_FBS_DEC = (1 << 1), /* FBS device error clear */
-- PORT_FBS_EN = (1 << 0), /* Enable FBS */
-+ PORT_FBS_SDE = BIT(2), /* FBS single device error */
-+ PORT_FBS_DEC = BIT(1), /* FBS device error clear */
-+ PORT_FBS_EN = BIT(0), /* Enable FBS */
-
- /* PORT_DEVSLP bits */
- PORT_DEVSLP_DM_OFFSET = 25, /* DITO multiplier offset */
-@@ -197,52 +198,52 @@ enum {
- PORT_DEVSLP_DITO_OFFSET = 15, /* DITO offset */
- PORT_DEVSLP_MDAT_OFFSET = 10, /* Minimum assertion time */
- PORT_DEVSLP_DETO_OFFSET = 2, /* DevSlp exit timeout */
-- PORT_DEVSLP_DSP = (1 << 1), /* DevSlp present */
-- PORT_DEVSLP_ADSE = (1 << 0), /* Aggressive DevSlp enable */
-+ PORT_DEVSLP_DSP = BIT(1), /* DevSlp present */
-+ PORT_DEVSLP_ADSE = BIT(0), /* Aggressive DevSlp enable */
-
- /* hpriv->flags bits */
-
- #define AHCI_HFLAGS(flags) .private_data = (void *)(flags)
-
-- AHCI_HFLAG_NO_NCQ = (1 << 0),
-- AHCI_HFLAG_IGN_IRQ_IF_ERR = (1 << 1), /* ignore IRQ_IF_ERR */
-- AHCI_HFLAG_IGN_SERR_INTERNAL = (1 << 2), /* ignore SERR_INTERNAL */
-- AHCI_HFLAG_32BIT_ONLY = (1 << 3), /* force 32bit */
-- AHCI_HFLAG_MV_PATA = (1 << 4), /* PATA port */
-- AHCI_HFLAG_NO_MSI = (1 << 5), /* no PCI MSI */
-- AHCI_HFLAG_NO_PMP = (1 << 6), /* no PMP */
-- AHCI_HFLAG_SECT255 = (1 << 8), /* max 255 sectors */
-- AHCI_HFLAG_YES_NCQ = (1 << 9), /* force NCQ cap on */
-- AHCI_HFLAG_NO_SUSPEND = (1 << 10), /* don't suspend */
-- AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = (1 << 11), /* treat SRST timeout as
-- link offline */
-- AHCI_HFLAG_NO_SNTF = (1 << 12), /* no sntf */
-- AHCI_HFLAG_NO_FPDMA_AA = (1 << 13), /* no FPDMA AA */
-- AHCI_HFLAG_YES_FBS = (1 << 14), /* force FBS cap on */
-- AHCI_HFLAG_DELAY_ENGINE = (1 << 15), /* do not start engine on
-- port start (wait until
-- error-handling stage) */
-- AHCI_HFLAG_NO_DEVSLP = (1 << 17), /* no device sleep */
-- AHCI_HFLAG_NO_FBS = (1 << 18), /* no FBS */
-+ AHCI_HFLAG_NO_NCQ = BIT(0),
-+ AHCI_HFLAG_IGN_IRQ_IF_ERR = BIT(1), /* ignore IRQ_IF_ERR */
-+ AHCI_HFLAG_IGN_SERR_INTERNAL = BIT(2), /* ignore SERR_INTERNAL */
-+ AHCI_HFLAG_32BIT_ONLY = BIT(3), /* force 32bit */
-+ AHCI_HFLAG_MV_PATA = BIT(4), /* PATA port */
-+ AHCI_HFLAG_NO_MSI = BIT(5), /* no PCI MSI */
-+ AHCI_HFLAG_NO_PMP = BIT(6), /* no PMP */
-+ AHCI_HFLAG_SECT255 = BIT(8), /* max 255 sectors */
-+ AHCI_HFLAG_YES_NCQ = BIT(9), /* force NCQ cap on */
-+ AHCI_HFLAG_NO_SUSPEND = BIT(10), /* don't suspend */
-+ AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = BIT(11), /* treat SRST timeout as
-+ link offline */
-+ AHCI_HFLAG_NO_SNTF = BIT(12), /* no sntf */
-+ AHCI_HFLAG_NO_FPDMA_AA = BIT(13), /* no FPDMA AA */
-+ AHCI_HFLAG_YES_FBS = BIT(14), /* force FBS cap on */
-+ AHCI_HFLAG_DELAY_ENGINE = BIT(15), /* do not start engine on
-+ port start (wait until
-+ error-handling stage) */
-+ AHCI_HFLAG_NO_DEVSLP = BIT(17), /* no device sleep */
-+ AHCI_HFLAG_NO_FBS = BIT(18), /* no FBS */
-
- #ifdef CONFIG_PCI_MSI
-- AHCI_HFLAG_MULTI_MSI = (1 << 20), /* per-port MSI(-X) */
-+ AHCI_HFLAG_MULTI_MSI = BIT(20), /* per-port MSI(-X) */
- #else
- /* compile out MSI infrastructure */
- AHCI_HFLAG_MULTI_MSI = 0,
- #endif
-- AHCI_HFLAG_WAKE_BEFORE_STOP = (1 << 22), /* wake before DMA stop */
-- AHCI_HFLAG_YES_ALPM = (1 << 23), /* force ALPM cap on */
-- AHCI_HFLAG_NO_WRITE_TO_RO = (1 << 24), /* don't write to read
-- only registers */
-- AHCI_HFLAG_IS_MOBILE = (1 << 25), /* mobile chipset, use
-- SATA_MOBILE_LPM_POLICY
-- as default lpm_policy */
-- AHCI_HFLAG_SUSPEND_PHYS = (1 << 26), /* handle PHYs during
-- suspend/resume */
-- AHCI_HFLAG_IGN_NOTSUPP_POWER_ON = (1 << 27), /* ignore -EOPNOTSUPP
-- from phy_power_on() */
-- AHCI_HFLAG_NO_SXS = (1 << 28), /* SXS not supported */
-+ AHCI_HFLAG_WAKE_BEFORE_STOP = BIT(22), /* wake before DMA stop */
-+ AHCI_HFLAG_YES_ALPM = BIT(23), /* force ALPM cap on */
-+ AHCI_HFLAG_NO_WRITE_TO_RO = BIT(24), /* don't write to read
-+ only registers */
-+ AHCI_HFLAG_IS_MOBILE = BIT(25), /* mobile chipset, use
-+ SATA_MOBILE_LPM_POLICY
-+ as default lpm_policy */
-+ AHCI_HFLAG_SUSPEND_PHYS = BIT(26), /* handle PHYs during
-+ suspend/resume */
-+ AHCI_HFLAG_IGN_NOTSUPP_POWER_ON = BIT(27), /* ignore -EOPNOTSUPP
-+ from phy_power_on() */
-+ AHCI_HFLAG_NO_SXS = BIT(28), /* SXS not supported */
-
- /* ap->flags bits */
-
-@@ -258,22 +259,22 @@ enum {
- EM_MAX_RETRY = 5,
-
- /* em_ctl bits */
-- EM_CTL_RST = (1 << 9), /* Reset */
-- EM_CTL_TM = (1 << 8), /* Transmit Message */
-- EM_CTL_MR = (1 << 0), /* Message Received */
-- EM_CTL_ALHD = (1 << 26), /* Activity LED */
-- EM_CTL_XMT = (1 << 25), /* Transmit Only */
-- EM_CTL_SMB = (1 << 24), /* Single Message Buffer */
-- EM_CTL_SGPIO = (1 << 19), /* SGPIO messages supported */
-- EM_CTL_SES = (1 << 18), /* SES-2 messages supported */
-- EM_CTL_SAFTE = (1 << 17), /* SAF-TE messages supported */
-- EM_CTL_LED = (1 << 16), /* LED messages supported */
-+ EM_CTL_RST = BIT(9), /* Reset */
-+ EM_CTL_TM = BIT(8), /* Transmit Message */
-+ EM_CTL_MR = BIT(0), /* Message Received */
-+ EM_CTL_ALHD = BIT(26), /* Activity LED */
-+ EM_CTL_XMT = BIT(25), /* Transmit Only */
-+ EM_CTL_SMB = BIT(24), /* Single Message Buffer */
-+ EM_CTL_SGPIO = BIT(19), /* SGPIO messages supported */
-+ EM_CTL_SES = BIT(18), /* SES-2 messages supported */
-+ EM_CTL_SAFTE = BIT(17), /* SAF-TE messages supported */
-+ EM_CTL_LED = BIT(16), /* LED messages supported */
-
- /* em message type */
-- EM_MSG_TYPE_LED = (1 << 0), /* LED */
-- EM_MSG_TYPE_SAFTE = (1 << 1), /* SAF-TE */
-- EM_MSG_TYPE_SES2 = (1 << 2), /* SES-2 */
-- EM_MSG_TYPE_SGPIO = (1 << 3), /* SGPIO */
-+ EM_MSG_TYPE_LED = BIT(0), /* LED */
-+ EM_MSG_TYPE_SAFTE = BIT(1), /* SAF-TE */
-+ EM_MSG_TYPE_SES2 = BIT(2), /* SES-2 */
-+ EM_MSG_TYPE_SGPIO = BIT(3), /* SGPIO */
- };
-
- struct ahci_cmd_hdr {
---
-2.39.2
-
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index 40d00575b..726823417 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.257 Kernel Configuration
+# Linux/arm 5.4.288 Kernel Configuration
#
#
@@ -1150,10 +1150,6 @@ CONFIG_AF_RXRPC=m
CONFIG_RXKAD=y
# CONFIG_AF_KCM is not set
CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
CONFIG_CFG80211=m
# CONFIG_NL80211_TESTMODE is not set
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -1469,7 +1465,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_DRBD is not set
# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SX8 is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -5652,6 +5647,9 @@ CONFIG_KEYS=y
# CONFIG_ENCRYPTED_KEYS is not set
# CONFIG_KEY_DH_OPERATIONS is not set
# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_PROC_MEM_ALWAYS_FORCE=y
+# CONFIG_PROC_MEM_FORCE_PTRACE is not set
+# CONFIG_PROC_MEM_NO_FORCE is not set
CONFIG_SECURITY=y
# CONFIG_SECURITYFS is not set
# CONFIG_SECURITY_NETWORK is not set
@@ -5725,7 +5723,6 @@ CONFIG_CRYPTO_CRYPTD=m
# CONFIG_CRYPTO_AUTHENC is not set
# CONFIG_CRYPTO_TEST is not set
CONFIG_CRYPTO_SIMD=m
-CONFIG_CRYPTO_ENGINE=m
#
# Public-key cryptography
@@ -5850,7 +5847,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_DEV_OMAP is not set
# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-CONFIG_CRYPTO_DEV_VIRTIO=m
+# CONFIG_CRYPTO_DEV_VIRTIO is not set
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_CCREE is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
diff --git a/tools/config-hot-fix.sh b/tools/config-hot-fix.sh
index 545423918..8ac465047 100755
--- a/tools/config-hot-fix.sh
+++ b/tools/config-hot-fix.sh
@@ -82,10 +82,6 @@ config="CONFIG_WIMAX" ; config_disable
config="CONFIG_WIMAX_I2400M" ; config_disable
config="CONFIG_WIMAX_I2400M_USB" ; config_disable
-#Docker.io:
-config="CONFIG_CGROUP_HUGETLB" ; config_enable
-config="CONFIG_RT_GROUP_SCHED" ; config_enable
-
#PHY: CONFIG_DP83867_PHY
config="CONFIG_DP83867_PHY" ; config_enable
@@ -95,6 +91,29 @@ config="CONFIG_REMOTEPROC_CDEV" ; config_enable
config="CONFIG_WKUP_M3_RPROC" ; config_enable
config="CONFIG_PRU_REMOTEPROC" ; config_module
+#Docker.io
+./scripts/config --enable CONFIG_NETFILTER_XT_MATCH_IPVS
+./scripts/config --enable CONFIG_CGROUP_BPF
+./scripts/config --enable CONFIG_BLK_DEV_THROTTLING
+./scripts/config --enable CONFIG_NET_CLS_CGROUP
+./scripts/config --enable CONFIG_CGROUP_NET_PRIO
+./scripts/config --enable CONFIG_IP_NF_TARGET_REDIRECT
+./scripts/config --enable CONFIG_IP_VS
+./scripts/config --enable CONFIG_IP_VS_NFCT
+./scripts/config --enable CONFIG_IP_VS_PROTO_TCP
+./scripts/config --enable CONFIG_IP_VS_PROTO_UDP
+./scripts/config --enable CONFIG_IP_VS_RR
+./scripts/config --enable CONFIG_SECURITY_SELINUX
+./scripts/config --enable CONFIG_SECURITY_APPARMOR
+./scripts/config --enable CONFIG_VXLAN
+./scripts/config --enable CONFIG_IPVLAN
+./scripts/config --enable CONFIG_DUMMY
+./scripts/config --enable CONFIG_NF_NAT_FTP
+./scripts/config --enable CONFIG_NF_CONNTRACK_FTP
+./scripts/config --enable CONFIG_NF_NAT_TFTP
+./scripts/config --enable CONFIG_NF_CONNTRACK_TFTP
+./scripts/config --enable CONFIG_DM_THIN_PROVISIONING
+
#abi="5.13.0-trunk"
#kernel="5.13.9-1~exp2"
config="CONFIG_BPF_UNPRIV_DEFAULT_OFF" ; config_enable
@@ -146,11 +165,30 @@ config="CONFIG_USB_CONFIGFS_F_UVC" ; config_enable
config="CONFIG_USB_CONFIGFS_F_PRINTER" ; config_enable
#2022.03.01 fix W1, needs to be a module now...
-config="CONFIG_W1" ; config_module
+config="CONFIG_W1" ; config_enable
config="CONFIG_W1_MASTER_GPIO" ; config_module
config="CONFIG_W1_SLAVE_DS2430" ; config_module
config="CONFIG_W1_SLAVE_DS2433_CRC" ; config_enable
+#2022.03.18 Re-Enable UIO PRUSS
+config="CONFIG_UIO_PDRV_GENIRQ" ; config_module
+config="CONFIG_UIO_PRUSS" ; config_module
+
+#2022.12.25: still totally broken..
+#[ 26.460634] tps65217-charger tps65217-charger: DMA mask not set
+#[ 26.581296] genirq: Flags mismatch irq 53. 00002000 (tps65217-charger) vs. 00002000 (vbus)
+#[ 26.739119] tps65217-charger tps65217-charger: Unable to register irq 53 err -16
+#[ 26.842097] tps65217-charger: probe of tps65217-charger failed with error -16
+config="CONFIG_CHARGER_TPS65217" ; config_disable
+
+#2023.07.10
+config="CONFIG_GCC_PLUGINS" ; config_disable
+
+#2023.07.14
+# MUSB DMA mode
+config="CONFIG_MUSB_PIO_ONLY" ; config_enable
+config="CONFIG_USB_TI_CPPI41_DMA" ; config_disable
+
# We recommend to turn off Real-Time group scheduling in the
# kernel when using systemd. RT group scheduling effectively
# makes RT scheduling unavailable for most userspace, since it
@@ -185,4 +223,90 @@ config="CONFIG_W1_SLAVE_DS2433_CRC" ; config_enable
#removed in 6.7-rc1
./scripts/config --disable CONFIG_DEV_APPLETALK
+#09.02.00.005
+./scripts/config --module CONFIG_VIDEO_TI_VIP
+./scripts/config --module CONFIG_VIDEO_OV1063X
+
+#20240305: regression on discord, some systemd can no longer load *.xz modules...
+./scripts/config --disable CONFIG_MODULE_DECOMPRESS
+
+#enable CONFIG_DYNAMIC_FTRACE
+./scripts/config --enable CONFIG_FUNCTION_TRACER
+./scripts/config --enable CONFIG_DYNAMIC_FTRACE
+
+./scripts/config --disable CONFIG_MODULE_COMPRESS_GZIP
+./scripts/config --enable CONFIG_MODULE_COMPRESS_XZ
+./scripts/config --disable CONFIG_MODULE_COMPRESS_ZSTD
+./scripts/config --enable CONFIG_GPIO_AGGREGATOR
+./scripts/config --module CONFIG_PWM_GPIO
+
+#10.00.05
+./scripts/config --module CONFIG_RPMSG_PRU
+
+#new in v6.12.x
+./scripts/config --enable CONFIG_RPMB
+./scripts/config --module CONFIG_ADXL380_SPI
+./scripts/config --module CONFIG_ADXL380_I2C
+./scripts/config --module CONFIG_AD4000
+./scripts/config --module CONFIG_AD4695
+./scripts/config --module CONFIG_PAC1921
+./scripts/config --module CONFIG_LTC2664
+./scripts/config --module CONFIG_ENS210
+./scripts/config --module CONFIG_BH1745
+./scripts/config --module CONFIG_SDP500
+./scripts/config --module CONFIG_HX9023S
+./scripts/config --module CONFIG_AW96103
+
+#debian 6.12~rc6-1~exp1
+./scripts/config --enable CONFIG_ZONE_DEVICE
+./scripts/config --module CONFIG_IP_VS_TWOS
+./scripts/config --module CONFIG_VIDEO_OV5648
+./scripts/config --enable CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV
+./scripts/config --module CONFIG_TI_PRUSS
+
+#debian 6.12.6-1
+./scripts/config --enable CONFIG_ZRAM_BACKEND_LZ4
+./scripts/config --enable CONFIG_ZRAM_BACKEND_LZ4HC
+./scripts/config --enable CONFIG_ZRAM_BACKEND_ZSTD
+./scripts/config --enable CONFIG_ZRAM_BACKEND_DEFLATE
+./scripts/config --enable CONFIG_ZRAM_DEF_COMP_LZ4
+./scripts/config --set-str CONFIG_ZRAM_DEF_COMP "lz4"
+
+#new in v6.14
+./scripts/config --module CONFIG_NTSYNC
+./scripts/config --module CONFIG_PPS_GENERATOR
+./scripts/config --module CONFIG_SENSORS_CRPS
+./scripts/config --module CONFIG_SENSORS_TPS25990
+./scripts/config --module CONFIG_BD79703
+./scripts/config --module CONFIG_OPT4060
+./scripts/config --enable CONFIG_FPROBE
+
+#TI: 11.00.01
+./scripts/config --enable CONFIG_SRAM_DMA_HEAP
+./scripts/config --module CONFIG_CC33XX
+./scripts/config --module CONFIG_CC33XX_SDIO
+./scripts/config --module CONFIG_VIDEO_IMX390
+./scripts/config --enable CONFIG_DMABUF_HEAPS
+./scripts/config --enable CONFIG_DMABUF_HEAPS_SYSTEM
+./scripts/config --enable CONFIG_DMABUF_HEAPS_CMA
+./scripts/config --enable CONFIG_DMABUF_HEAPS_CARVEOUT
+
+#debian Trixie has fubared lz4/lz4c, back to xz for stabilty...
+# LZ4 arch/arm/boot/compressed/piggy_data
+#Error : stdout won't be used ! Do you want multiple input files (-m) ?
+#make[3]: *** [arch/arm/boot/compressed/Makefile:156: arch/arm/boot/compressed/piggy_data] Error 1
+
+./scripts/config --disable CONFIG_KERNEL_LZO
+./scripts/config --disable CONFIG_KERNEL_LZ4
+./scripts/config --enable CONFIG_KERNEL_XZ
+
+#configure CONFIG_EXTRA_FIRMWARE
+./scripts/config --set-str CONFIG_EXTRA_FIRMWARE "regulatory.db regulatory.db.p7s am335x-pm-firmware.elf am335x-bone-scale-data.bin am335x-evm-scale-data.bin am43x-evm-scale-data.bin"
+./scripts/config --enable CONFIG_FW_LOADER_COMPRESS
+./scripts/config --enable CONFIG_FW_LOADER_COMPRESS_XZ
+./scripts/config --enable CONFIG_FW_LOADER_COMPRESS_ZSTD
+
+#BeagleBoard.org
+./scripts/config --enable CONFIG_MSPM0_I2C
+
cd ${DIR}/
diff --git a/version.sh b/version.sh
index de4224036..bdec5f09c 100644
--- a/version.sh
+++ b/version.sh
@@ -50,11 +50,11 @@ linux_repo="https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/li
linux_stable_repo="https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git"
#
KERNEL_REL=5.4
-KERNEL_TAG=${KERNEL_REL}.257
+KERNEL_TAG=${KERNEL_REL}.288
#https://mirrors.edge.kernel.org/pub/linux/kernel/projects/rt/5.4/
-kernel_rt=".257-rt87"
+kernel_rt=".288-rt94"
#Kernel Build
-BUILD=${build_prefix}68
+BUILD=${build_prefix}68.1
#v6.X-rcX + upto SHA
#prev_KERNEL_SHA=""
--
GitLab