diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2017-08-15 14:42:42 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2017-08-15 14:42:42 +0530 |
| commit | 27f659ddd0ab03ddf2a8248c6cd0d005a933ee01 (patch) | |
| tree | 3748cc6b25dfcbf5ad3ee77018e49d71fa2052fa /kernel/fork.c | |
| parent | f5ec4ffd9c9ddf29aaf339a8619a5cd145f62342 (diff) | |
| parent | f7c8f04f49568e772560bbe388895daaf9b053f6 (diff) | |
Merge remote-tracking branch 'stable-rc/linux-4.4.y' into 4.4.83-rc-hikey4.4-83-rc-hikey-20170815
Diffstat (limited to 'kernel/fork.c')
| -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 0ee630f3ad4b..68cfda1c1800 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -368,7 +368,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 /* |