From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936642AbcKPId2 (ORCPT ); Wed, 16 Nov 2016 03:33:28 -0500 Received: from terminus.zytor.com ([198.137.202.10]:57718 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933142AbcKPIdY (ORCPT ); Wed, 16 Nov 2016 03:33:24 -0500 Date: Wed, 16 Nov 2016 00:33:06 -0800 From: tip-bot for Nicolas Pitre Message-ID: Cc: hpa@zytor.com, richardcochran@gmail.com, nicolas.pitre@linaro.org, mingo@kernel.org, pebolle@tiscali.nl, linux-kernel@vger.kernel.org, nico@linaro.org, john.stultz@linaro.org, josh@joshtriplett.org, tglx@linutronix.de, ecree@solarflare.com, mmarek@suse.com Reply-To: pebolle@tiscali.nl, mingo@kernel.org, nicolas.pitre@linaro.org, richardcochran@gmail.com, hpa@zytor.com, tglx@linutronix.de, mmarek@suse.com, ecree@solarflare.com, josh@joshtriplett.org, john.stultz@linaro.org, nico@linaro.org, linux-kernel@vger.kernel.org In-Reply-To: <1478841010-28605-6-git-send-email-nicolas.pitre@linaro.org> References: <1478841010-28605-6-git-send-email-nicolas.pitre@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] posix_cpu_timers: Move the add_device_randomness() call to a proper place Git-Commit-ID: 53d3eaa31508222e445b489f3c3ac4c63542a4ef X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 53d3eaa31508222e445b489f3c3ac4c63542a4ef Gitweb: http://git.kernel.org/tip/53d3eaa31508222e445b489f3c3ac4c63542a4ef Author: Nicolas Pitre AuthorDate: Fri, 11 Nov 2016 00:10:09 -0500 Committer: Thomas Gleixner CommitDate: Wed, 16 Nov 2016 09:26:34 +0100 posix_cpu_timers: Move the add_device_randomness() call to a proper place There is no logical relation between add_device_randomness() and posix_cpu_timers_exit(). Let's move the former to where the later is called. This way, when posix-cpu-timers.c is compiled out, there is no need to worry about not losing a call to add_device_randomness(). Signed-off-by: Nicolas Pitre Acked-by: John Stultz Cc: Paul Bolle Cc: linux-kbuild@vger.kernel.org Cc: netdev@vger.kernel.org Cc: Richard Cochran Cc: Josh Triplett Cc: Michal Marek Cc: Edward Cree Link: http://lkml.kernel.org/r/1478841010-28605-6-git-send-email-nicolas.pitre@linaro.org Signed-off-by: Thomas Gleixner --- kernel/exit.c | 4 ++++ kernel/time/posix-cpu-timers.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/exit.c b/kernel/exit.c index 9d68c45..d16bcdd 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -116,6 +117,9 @@ static void __exit_signal(struct task_struct *tsk) sig->curr_target = next_thread(tsk); } + add_device_randomness((const void*) &tsk->se.sum_exec_runtime, + sizeof(unsigned long long)); + /* * Accumulate here the counters for all threads as they die. We could * skip the group leader because it is the last user of signal_struct, diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index 39008d7..e582f20 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include @@ -447,10 +446,7 @@ static void cleanup_timers(struct list_head *head) */ void posix_cpu_timers_exit(struct task_struct *tsk) { - add_device_randomness((const void*) &tsk->se.sum_exec_runtime, - sizeof(unsigned long long)); cleanup_timers(tsk->cpu_timers); - } void posix_cpu_timers_exit_group(struct task_struct *tsk) {