shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a887a44ace2a27d86308356a7ea0db00d79f2c44' of https://android.googlesource.com/kernel/common

Browse Source 
* commit 'a887a44ace2a27d86308356a7ea0db00d79f2c44': (3057 commits)
  ANDROID: KVM: arm64: Always check state from host_ack_unshare()
  FROMLIST: KVM: arm64: Always check the state from hyp_ack_unshare()
  UPSTREAM: f2fs: fix fiemap failure issue when page size is 16KB
  ANDROID: GKI: Update symbol list for mtk
  UPSTREAM: net/sched: stop qdisc_tree_reduce_backlog on TC_H_ROOT
  UPSTREAM: net: sched: use RCU read-side critical section in taprio_dump()
  UPSTREAM: f2fs: compress: don't redirty sparse cluster during {,de}compress
  UPSTREAM: f2fs: compress: don't {,de}compress non-full cluster
  UPSTREAM: f2fs: allow f2fs_ioc_{,de}compress_file to be interrupted
  UPSTREAM: f2fs: compress: do sanity check on cluster when CONFIG_F2FS_CHECK_FS is on
  UPSTREAM: f2fs: support SEEK_DATA and SEEK_HOLE for compression files
  ANDROID: add file for recording allowed ABI breaks
  ANDROID: GKI: update symbol list for honor
  ANDROID: vendor_hooks: add hook to record reboot reason
  BACKPORT: FROMGIT: binder: add delivered_freeze to debugfs output
  BACKPORT: FROMGIT: binder: fix memleak of proc->delivered_freeze
  FROMGIT: binder: allow freeze notification for dead nodes
  FROMGIT: binder: fix BINDER_WORK_CLEAR_FREEZE_NOTIFICATION debug logs
  ANDROID: GKI: Update symbol list for BCMSTB
  ANDROID: psi: Add vendor hooks for PSI tracing
  ...

Change-Id: I5b8cfb8bec82380db9cdd9fbe3b39708a8f92f98

Conflicts:
	arch/arm64/boot/dts/rockchip/rk356x.dtsi
	drivers/gpio/gpio-rockchip.c
	drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.h
	drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
	drivers/gpu/drm/rockchip/rockchip_vop_reg.c
	drivers/media/i2c/imx335.c
	drivers/pci/controller/dwc/pcie-dw-rockchip.c
	drivers/spi/spi-rockchip.c
	drivers/spi/spidev.c
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/typec/tcpm/tcpm.c
This commit is contained in:
Tao Huang
2025-01-10 17:54:00 +08:00
parent 0e31ee9a8e a887a44ace
commit bcac4856be
2266 changed files with 37159 additions and 22126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/workqueue.c
View File

@@ -5906,10 +5906,18 @@ static void wq_watchdog_timer_fn(struct timer_list *unused)
notrace void wq_watchdog_touch(int cpu)
{
if (cpu >= 0)
per_cpu(wq_watchdog_touched_cpu, cpu) = jiffies;
unsigned long thresh = READ_ONCE(wq_watchdog_thresh) * HZ;
unsigned long touch_ts = READ_ONCE(wq_watchdog_touched);
unsigned long now = jiffies;
wq_watchdog_touched = jiffies;
if (cpu >= 0)
per_cpu(wq_watchdog_touched_cpu, cpu) = now;
else
WARN_ONCE(1, "%s should be called with valid CPU", __func__);
/* Don't unnecessarily store to global cacheline */
if (time_after(now, touch_ts + thresh / 4))
WRITE_ONCE(wq_watchdog_touched, jiffies);
}
static void wq_watchdog_set_thresh(unsigned long thresh)