diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-05-07 19:59:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-05-07 19:59:57 +0200 |
| commit | 181b21170b6eddd545ba3e8d343688d4d34e1e35 (patch) | |
| tree | 296593bb0c7bca243f11912d118dbba5b7a6a8a6 /kernel | |
| parent | 6642d0d2174193cf653382f104fbf54832ad658f (diff) | |
| parent | 5ea30e4e58040cfd6434c2f33dc3ea76e2c15b05 (diff) | |
Merge branch 'core/urgent'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 41a8ea030f8c..d657da15aeaf 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -536,7 +536,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node) set_task_stack_end_magic(tsk); #ifdef CONFIG_CC_STACKPROTECTOR - tsk->stack_canary = get_random_int(); + tsk->stack_canary = get_random_long(); #endif /* |