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

Merge commit 'a81422efff2f'

Browse Source 
It contains the following 82894 commits:

  UPSTREAM: usb: dwc3: gadget: Move null pinter check to proper place
  UPSTREAM: dma-buf: call dma_buf_stats_setup after dmabuf is in valid list
  clk: rockchip: rk3588: Add CLK_SET_RATE_PARENT for i2s5/6 frac clk
  media: rockchip: isp: fix vicap fast stream on and off
  dt-bindings: update SPDX-License-Identifier for rockchip clock header
  dt-bindings: update SPDX-License-Identifier for rockchip power header
  ASoC: es7202: fix es7202 read & write error
  media: i2c: sc430cs support get real fps
  media: i2c: sc430cs fixed compile error
  media: i2c: sc4238 support get channel info
  media: i2c: sc4238 support get real fps
  media: i2c: sc4238 fixed compile error
  media: i2c: sc2310 support get channel info
  media: i2c: sc2310 support get real fps
  media: i2c: sc2310 fixed compile error
  media: i2c: sc2239 support get real fps
  media: i2c: sc2239 fixed compile error
  media: i2c: sc2232 support get real fps
  media: i2c: sc2232 fixed compile error
  media: i2c: sc210iot support get real fps
  ...

Conflicts:
	drivers/android/Kconfig
	drivers/dma-buf/dma-buf.c
	drivers/irqchip/irq-gic-v3-its.c
	drivers/usb/dwc3/gadget.c
	sound/soc/rockchip/rockchip_i2s.c

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I0aa6721d035488a1368205c0437ea2c6452c1bb0
This commit is contained in:
Tao Huang
2022-09-07 16:43:09 +08:00
parent 3975ff5ce6 a81422efff
commit 8e8c0e1ce1
11152 changed files with 8741514 additions and 16975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/workqueue.c
View File

@@ -51,6 +51,7 @@
#include <linux/sched/isolation.h>
#include <linux/nmi.h>
#include <linux/kvm_para.h>
#include <uapi/linux/sched/types.h>
#include "workqueue_internal.h"
@@ -1961,6 +1962,15 @@ static struct worker *create_worker(struct worker_pool *pool)
trace_android_vh_create_worker(worker, pool->attrs);
set_user_nice(worker->task, pool->attrs->nice);
if (IS_ENABLED(CONFIG_ROCKCHIP_OPTIMIZE_RT_PRIO)) {
struct sched_param param;
if (pool->attrs->nice == 0)
param.sched_priority = MAX_RT_PRIO / 2 - 4;
else
param.sched_priority = MAX_RT_PRIO / 2 - 2;
sched_setscheduler_nocheck(worker->task, SCHED_RR, &param);
}
kthread_bind_mask(worker->task, pool->attrs->cpumask);
/* successful, attach the worker to the pool */