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

Merge tag 'android13-5.10-2023-02_r1' of https://android.googlesource.com/kernel/common

Browse Source 
android13-5.10 February 2023 release 1

Artifacts:
  https://ci.android.com/builds/submitted/9611411/kernel_aarch64/latest

* tag 'android13-5.10-2023-02_r1': (5234 commits)
  ANDROID: GKI: rockchip: add symbols for drm hdcp
  BACKPORT: PCI: dwc: Support multiple ATU memory regions
  ANDROID: cpuidle-psci: Fix suspicious RCU usage
  ANDROID: Update the ABI representation
  ANDROID: fix up struct task_struct ABI change in 5.10.162
  ANDROID: struct io_uring ABI preservation hack for 5.10.162 changes
  ANDROID: add flags variable back to struct proto_ops
  UPSTREAM: io_uring: pass in EPOLL_URING_WAKE for eventfd signaling and wakeups
  UPSTREAM: eventfd: provide a eventfd_signal_mask() helper
  UPSTREAM: eventpoll: add EPOLL_URING_WAKE poll wakeup flag
  UPSTREAM: Revert "proc: don't allow async path resolution of /proc/self components"
  UPSTREAM: Revert "proc: don't allow async path resolution of /proc/thread-self components"
  UPSTREAM: net: remove cmsg restriction from io_uring based send/recvmsg calls
  UPSTREAM: task_work: unconditionally run task_work from get_signal()
  UPSTREAM: signal: kill JOBCTL_TASK_WORK
  UPSTREAM: io_uring: import 5.15-stable io_uring
  UPSTREAM: task_work: add helper for more targeted task_work canceling
  UPSTREAM: kernel: don't call do_exit() for PF_IO_WORKER threads
  UPSTREAM: kernel: stop masking signals in create_io_thread()
  UPSTREAM: x86/process: setup io_threads more like normal user space threads
  ...

Change-Id: I470528ec3aa69693220e7c0e5b52077b60aebe81

Conflicts:
	Makefile
	drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
	drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
	drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/media/usb/uvc/uvc_driver.c
	drivers/media/usb/uvc/uvcvideo.h
	drivers/mmc/core/mmc.c
	drivers/pinctrl/pinctrl-rockchip.c
	drivers/regulator/core.c
	drivers/usb/dwc3/core.h
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/function/f_hid.c
	drivers/usb/gadget/function/f_uvc.c
	drivers/usb/gadget/function/uvc.h
	drivers/usb/gadget/function/uvc_configfs.c
	drivers/usb/gadget/function/uvc_queue.c
	drivers/usb/gadget/function/uvc_v4l2.c
	drivers/usb/gadget/function/uvc_video.c
	drivers/usb/host/xhci.h
	drivers/usb/storage/unusual_uas.h
	drivers/usb/typec/altmodes/displayport.c
	mm/cma.c
	sound/core/pcm_dmaengine.c
	include/linux/stmmac.h
	sound/drivers/aloop.c
This commit is contained in:
Tao Huang
2023-03-23 20:34:12 +08:00
parent cbac047f24 1e1264f254
commit 2cf392ecb9
4347 changed files with 84680 additions and 42859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/workqueue.c
View File

@@ -55,6 +55,7 @@
#include "workqueue_internal.h"
#include <trace/hooks/wqlockup.h>
#include <trace/hooks/workqueue.h>
/* events/workqueue.h uses default TRACE_INCLUDE_PATH */
#undef TRACE_INCLUDE_PATH
@@ -3075,10 +3076,8 @@ static bool __flush_work(struct work_struct *work, bool from_cancel)
if (WARN_ON(!work->func))
return false;
if (!from_cancel) {
lock_map_acquire(&work->lockdep_map);
lock_map_release(&work->lockdep_map);
}
lock_map_acquire(&work->lockdep_map);
lock_map_release(&work->lockdep_map);
if (start_flush_work(work, &barr, from_cancel)) {
wait_for_completion(&barr.done);
@@ -5854,6 +5853,7 @@ static void wq_watchdog_timer_fn(struct timer_list *unused)
pr_cont_pool_info(pool);
pr_cont(" stuck for %us!\n",
jiffies_to_msecs(now - pool_ts) / 1000);
trace_android_vh_wq_lockup_pool(pool->cpu, pool_ts);
}
}