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
Showing the changes to kernel (1 of 1 file). Show all
Unified · Split
| @@ -825,8 +825,10 @@ static void check_thread_timers(struct task_struct *tsk, · 824 unmodified lines | ||
| 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 | } |
| @@ -838,8 +840,10 @@ static void check_thread_timers(struct task_struct *tsk, · 5 unmodified lines | ||
| 838 | 840 | soft += USEC_PER_SEC; |
| 839 | 841 | sig->rlim[RLIMIT_RTTIME].rlim_cur = soft; |
| 840 | 842 | } |
| 841 | − pr_info("RT Watchdog Timeout (soft): %s[%d]\n", | |
| 842 | − tsk->comm, task_pid_nr(tsk)); | |
| 843 | + if (print_fatal_signals) { | |
| 844 | + pr_info("RT Watchdog Timeout (soft): %s[%d]\n", | |
| 845 | + tsk->comm, task_pid_nr(tsk)); | |
| 846 | + } | |
| 843 | 847 | __group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk); |
| 844 | 848 | } |
| 845 | 849 | } |
| @@ -936,8 +940,10 @@ static void check_process_timers(struct task_struct *tsk, · 90 unmodified lines | ||
| 936 | 940 | * At the hard limit, we just die. |
| 937 | 941 | * No need to calculate anything else now. |
| 938 | 942 | */ |
| 939 | − pr_info("RT Watchdog Timeout (hard): %s[%d]\n", | |
| 940 | − tsk->comm, task_pid_nr(tsk)); | |
| 943 | + if (print_fatal_signals) { | |
| 944 | + pr_info("RT Watchdog Timeout (hard): %s[%d]\n", | |
| 945 | + tsk->comm, task_pid_nr(tsk)); | |
| 946 | + } | |
| 941 | 947 | __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); |
| 942 | 948 | return; |
| 943 | 949 | } |
| @@ -945,8 +951,10 @@ static void check_process_timers(struct task_struct *tsk, · 1 unmodified line | ||
| 945 | 951 | /* |
| 946 | 952 | * At the soft limit, send a SIGXCPU every second. |
| 947 | 953 | */ |
| 948 | − pr_info("CPU Watchdog Timeout (soft): %s[%d]\n", | |
| 949 | − tsk->comm, task_pid_nr(tsk)); | |
| 954 | + if (print_fatal_signals) { | |
| 955 | + pr_info("CPU Watchdog Timeout (soft): %s[%d]\n", | |
| 956 | + tsk->comm, task_pid_nr(tsk)); | |
| 957 | + } | |
| 950 | 958 | __group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk); |
| 951 | 959 | if (soft < hard) { |
| 952 | 960 | soft++; |