Commit 53d3eaa3 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Thomas Gleixner

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: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: linux-kbuild@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Michal Marek <mmarek@suse.com>
Cc: Edward Cree <ecree@solarflare.com>
Link: http://lkml.kernel.org/r/1478841010-28605-6-git-send-email-nicolas.pitre@linaro.orgSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 74ba181e
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
#include <linux/writeback.h> #include <linux/writeback.h>
#include <linux/shm.h> #include <linux/shm.h>
#include <linux/kcov.h> #include <linux/kcov.h>
#include <linux/random.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/unistd.h> #include <asm/unistd.h>
...@@ -116,6 +117,9 @@ static void __exit_signal(struct task_struct *tsk) ...@@ -116,6 +117,9 @@ static void __exit_signal(struct task_struct *tsk)
sig->curr_target = next_thread(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 * 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, * skip the group leader because it is the last user of signal_struct,
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
#include <trace/events/timer.h> #include <trace/events/timer.h>
#include <linux/random.h>
#include <linux/tick.h> #include <linux/tick.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
...@@ -447,10 +446,7 @@ static void cleanup_timers(struct list_head *head) ...@@ -447,10 +446,7 @@ static void cleanup_timers(struct list_head *head)
*/ */
void posix_cpu_timers_exit(struct task_struct *tsk) 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); cleanup_timers(tsk->cpu_timers);
} }
void posix_cpu_timers_exit_group(struct task_struct *tsk) void posix_cpu_timers_exit_group(struct task_struct *tsk)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment