Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sched-urgent-2023-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Miscellaneous scheduler fixes: a reporting fix, a static symbol fix,
and a kernel-doc fix"
* tag 'sched-urgent-2023-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/core: Report correct state for TASK_IDLE | TASK_FREEZABLE
sched/fair: Make update_entity_lag() static
sched/core: Add kernel-doc for set_cpus_allowed_ptr()
+13
-3
+12
-2
include/linux/sched.h
+12
-2
include/linux/sched.h
···
1671
1671
1672
1672
BUILD_BUG_ON_NOT_POWER_OF_2(TASK_REPORT_MAX);
1673
1673
1674
-
if (tsk_state == TASK_IDLE)
1674
+
if ((tsk_state & TASK_IDLE) == TASK_IDLE)
1675
1675
state = TASK_REPORT_IDLE;
1676
1676
1677
1677
/*
···
1679
1679
* to userspace, we can make this appear as if the task has gone through
1680
1680
* a regular rt_mutex_lock() call.
1681
1681
*/
1682
-
if (tsk_state == TASK_RTLOCK_WAIT)
1682
+
if (tsk_state & TASK_RTLOCK_WAIT)
1683
1683
state = TASK_UNINTERRUPTIBLE;
1684
1684
1685
1685
return fls(state);
···
1858
1858
extern int dl_bw_alloc(int cpu, u64 dl_bw);
1859
1859
extern void dl_bw_free(int cpu, u64 dl_bw);
1860
1860
#ifdef CONFIG_SMP
1861
+
1862
+
/* do_set_cpus_allowed() - consider using set_cpus_allowed_ptr() instead */
1861
1863
extern void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask);
1864
+
1865
+
/**
1866
+
* set_cpus_allowed_ptr - set CPU affinity mask of a task
1867
+
* @p: the task
1868
+
* @new_mask: CPU affinity mask
1869
+
*
1870
+
* Return: zero if successful, or a negative error code
1871
+
*/
1862
1872
extern int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask);
1863
1873
extern int dup_user_cpus_ptr(struct task_struct *dst, struct task_struct *src, int node);
1864
1874
extern void release_user_cpus_ptr(struct task_struct *p);
+1
-1
kernel/sched/fair.c
+1
-1
kernel/sched/fair.c