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

Changed files
+16 -8
kernel
+16 -8
kernel/time/posix-cpu-timers.c
··· 825 825 * At the hard limit, we just die. 826 826 * No need to calculate anything else now. 827 827 */ 828 - pr_info("CPU Watchdog Timeout (hard): %s[%d]\n", 829 - tsk->comm, task_pid_nr(tsk)); 828 + if (print_fatal_signals) { 829 + pr_info("CPU Watchdog Timeout (hard): %s[%d]\n", 830 + tsk->comm, task_pid_nr(tsk)); 831 + } 830 832 __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); 831 833 return; 832 834 } ··· 840 838 soft += USEC_PER_SEC; 841 839 sig->rlim[RLIMIT_RTTIME].rlim_cur = soft; 842 840 } 843 - pr_info("RT Watchdog Timeout (soft): %s[%d]\n", 844 - tsk->comm, task_pid_nr(tsk)); 841 + if (print_fatal_signals) { 842 + pr_info("RT Watchdog Timeout (soft): %s[%d]\n", 843 + tsk->comm, task_pid_nr(tsk)); 844 + } 845 845 __group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk); 846 846 } 847 847 } ··· 940 936 * At the hard limit, we just die. 941 937 * No need to calculate anything else now. 942 938 */ 943 - pr_info("RT Watchdog Timeout (hard): %s[%d]\n", 944 - tsk->comm, task_pid_nr(tsk)); 939 + if (print_fatal_signals) { 940 + pr_info("RT Watchdog Timeout (hard): %s[%d]\n", 941 + tsk->comm, task_pid_nr(tsk)); 942 + } 945 943 __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); 946 944 return; 947 945 } ··· 951 945 /* 952 946 * At the soft limit, send a SIGXCPU every second. 953 947 */ 954 - pr_info("CPU Watchdog Timeout (soft): %s[%d]\n", 955 - tsk->comm, task_pid_nr(tsk)); 948 + if (print_fatal_signals) { 949 + pr_info("CPU Watchdog Timeout (soft): %s[%d]\n", 950 + tsk->comm, task_pid_nr(tsk)); 951 + } 956 952 __group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk); 957 953 if (soft < hard) { 958 954 soft++;