提交 39b8ab31 编写于 作者: L Linus Torvalds

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixlet from Thomas Gleixner:
 "Silence dmesg spam by making the posix cpu timer printks depend on
  print_fatal_signals"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  posix-timers: Make signal printks conditional
...@@ -825,8 +825,10 @@ static void check_thread_timers(struct task_struct *tsk, ...@@ -825,8 +825,10 @@ static void check_thread_timers(struct task_struct *tsk,
* At the hard limit, we just die. * At the hard limit, we just die.
* No need to calculate anything else now. * No need to calculate anything else now.
*/ */
if (print_fatal_signals) {
pr_info("CPU Watchdog Timeout (hard): %s[%d]\n", pr_info("CPU Watchdog Timeout (hard): %s[%d]\n",
tsk->comm, task_pid_nr(tsk)); tsk->comm, task_pid_nr(tsk));
}
__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
return; return;
} }
...@@ -838,8 +840,10 @@ static void check_thread_timers(struct task_struct *tsk, ...@@ -838,8 +840,10 @@ static void check_thread_timers(struct task_struct *tsk,
soft += USEC_PER_SEC; soft += USEC_PER_SEC;
sig->rlim[RLIMIT_RTTIME].rlim_cur = soft; sig->rlim[RLIMIT_RTTIME].rlim_cur = soft;
} }
if (print_fatal_signals) {
pr_info("RT Watchdog Timeout (soft): %s[%d]\n", pr_info("RT Watchdog Timeout (soft): %s[%d]\n",
tsk->comm, task_pid_nr(tsk)); tsk->comm, task_pid_nr(tsk));
}
__group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk); __group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk);
} }
} }
...@@ -936,8 +940,10 @@ static void check_process_timers(struct task_struct *tsk, ...@@ -936,8 +940,10 @@ static void check_process_timers(struct task_struct *tsk,
* At the hard limit, we just die. * At the hard limit, we just die.
* No need to calculate anything else now. * No need to calculate anything else now.
*/ */
if (print_fatal_signals) {
pr_info("RT Watchdog Timeout (hard): %s[%d]\n", pr_info("RT Watchdog Timeout (hard): %s[%d]\n",
tsk->comm, task_pid_nr(tsk)); tsk->comm, task_pid_nr(tsk));
}
__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
return; return;
} }
...@@ -945,8 +951,10 @@ static void check_process_timers(struct task_struct *tsk, ...@@ -945,8 +951,10 @@ static void check_process_timers(struct task_struct *tsk,
/* /*
* At the soft limit, send a SIGXCPU every second. * At the soft limit, send a SIGXCPU every second.
*/ */
if (print_fatal_signals) {
pr_info("CPU Watchdog Timeout (soft): %s[%d]\n", pr_info("CPU Watchdog Timeout (soft): %s[%d]\n",
tsk->comm, task_pid_nr(tsk)); tsk->comm, task_pid_nr(tsk));
}
__group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk); __group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk);
if (soft < hard) { if (soft < hard) {
soft++; soft++;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册