Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sched-urgent-2020-08-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Two fixes: fix a new tracepoint's output value, and fix the formatting
of show-state syslog printouts"
* tag 'sched-urgent-2020-08-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/debug: Fix the alignment of the show-state debug output
sched: Fix use of count for nr_running tracepoint
+5
-12
+4
-11
kernel/sched/core.c
+4
-11
kernel/sched/core.c
···
6431
6431
if (!try_get_task_stack(p))
6432
6432
return;
6433
6433
6434
-
printk(KERN_INFO "%-15.15s %c", p->comm, task_state_to_char(p));
6434
+
pr_info("task:%-15.15s state:%c", p->comm, task_state_to_char(p));
6435
6435
6436
6436
if (p->state == TASK_RUNNING)
6437
-
printk(KERN_CONT " running task ");
6437
+
pr_cont(" running task ");
6438
6438
#ifdef CONFIG_DEBUG_STACK_USAGE
6439
6439
free = stack_not_used(p);
6440
6440
#endif
···
6443
6443
if (pid_alive(p))
6444
6444
ppid = task_pid_nr(rcu_dereference(p->real_parent));
6445
6445
rcu_read_unlock();
6446
-
printk(KERN_CONT "%5lu %5d %6d 0x%08lx\n", free,
6447
-
task_pid_nr(p), ppid,
6446
+
pr_cont(" stack:%5lu pid:%5d ppid:%6d flags:0x%08lx\n",
6447
+
free, task_pid_nr(p), ppid,
6448
6448
(unsigned long)task_thread_info(p)->flags);
6449
6449
6450
6450
print_worker_info(KERN_INFO, p);
···
6479
6479
{
6480
6480
struct task_struct *g, *p;
6481
6481
6482
-
#if BITS_PER_LONG == 32
6483
-
printk(KERN_INFO
6484
-
" task PC stack pid father\n");
6485
-
#else
6486
-
printk(KERN_INFO
6487
-
" task PC stack pid father\n");
6488
-
#endif
6489
6482
rcu_read_lock();
6490
6483
for_each_process_thread(g, p) {
6491
6484
/*
+1
-1
kernel/sched/sched.h
+1
-1
kernel/sched/sched.h