Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39b8ab31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents de0b9d75 43fe8b8e

kernel/time/posix-cpu-timers.c

+16 −8
Original line number Diff line number Diff line
@@ -825,8 +825,10 @@ static void check_thread_timers(struct task_struct *tsk, 
			 * At the hard limit, we just die.

			 * No need to calculate anything else now.

			 */

			if (print_fatal_signals) {

				pr_info("CPU Watchdog Timeout (hard): %s[%d]\n",

					tsk->comm, task_pid_nr(tsk));

			}

			__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);

			return;

		}
@@ -838,8 +840,10 @@ static void check_thread_timers(struct task_struct *tsk, 
				soft += USEC_PER_SEC;

				sig->rlim[RLIMIT_RTTIME].rlim_cur = soft;

			}

			if (print_fatal_signals) {

				pr_info("RT Watchdog Timeout (soft): %s[%d]\n",

					tsk->comm, task_pid_nr(tsk));

			}

			__group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk);

		}

	}
@@ -936,8 +940,10 @@ static void check_process_timers(struct task_struct *tsk, 
			 * At the hard limit, we just die.

			 * No need to calculate anything else now.

			 */

			if (print_fatal_signals) {

				pr_info("RT Watchdog Timeout (hard): %s[%d]\n",

					tsk->comm, task_pid_nr(tsk));

			}

			__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);

			return;

		}
@@ -945,8 +951,10 @@ static void check_process_timers(struct task_struct *tsk, 
			/*

			 * At the soft limit, send a SIGXCPU every second.

			 */

			if (print_fatal_signals) {

				pr_info("CPU Watchdog Timeout (soft): %s[%d]\n",

					tsk->comm, task_pid_nr(tsk));

			}

			__group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk);

			if (soft < hard) {

				soft++;