mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 02:50:49 +09:00
Merge commit '2a9a2567650d3b105640d3c2f3b9ff4b32403829'
* commit '2a9a2567650d3b105640d3c2f3b9ff4b32403829': (107027 commits) drm/edid: add config option of edid function rtc: rockchip: use devm_rtc_register_device() phy: rockchip: usbdp: fix compile error for kernel 5.19 drm/rockchip: drv: import DMA_BUF module namespace ANDROID: include: drm: increase DRM max property count to 64 PCI: rockchip: Fix compile error phy: rockchip-naneng-usb2: Use fallthrough pseudo-keyword video: rockchip: rve: Replace ksys_close with close_fd arm64: dts: rockchip: rk3562: Enable viLKsvPwrActive for soc bus mtd: spi-nor: esmt: Support New devices mtd: spi-nor: fmsh: Support New devices mtd: spi-nor: gigadevice: Support New devices mtd: spinand: gsto: Add code mtd: spinand: hyf: Support new devices mmc: convert thunder boot dependency ARM: dts: rockchip: rv1106: add node for system sleep ARM: rockchip: support rv1106 suspend ARM: rockchip: add some pm-related functions video: rockchip: mpp: fix rk3528 avsd not probe issue arm64: dts: rockchip: rk3588-vehicle-maxim-serdes: Add BOE AV156FHT L83 support ... Change-Id: I04a2b2c7ceecbddf6a801891eebc64abdc1713ca Conflicts: drivers/base/power/qos.c drivers/base/syscore.c drivers/dma-buf/dma-buf.c drivers/pwm/pwm-rockchip.c drivers/tty/hvc/hvc_console.h drivers/usb/dwc3/gadget.c drivers/usb/gadget/function/Makefile fs/pstore/pmsg.c include/linux/dma-buf.h include/linux/dma-heap.h include/linux/sched/xacct.h include/linux/task_io_accounting.h include/linux/task_io_accounting_ops.h kernel/sched/cpufreq_schedutil.c kernel/trace/power-traces.c mm/slub.c
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -1959,6 +1960,15 @@ static struct worker *create_worker(struct worker_pool *pool)
|
||||
goto fail;
|
||||
|
||||
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, ¶m);
|
||||
}
|
||||
kthread_bind_mask(worker->task, pool->attrs->cpumask);
|
||||
|
||||
/* successful, attach the worker to the pool */
|
||||
|
||||
Reference in New Issue
Block a user