mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-16 13:19:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'fixes', 'mcpm', 'misc' and 'mmci' into for-next

Browse Source
This commit is contained in:
Russell King
2013-06-29 11:43:28 +01:00
parent 3e0a07f8c4 6c93dd438a 1b21376a73 0125962000
commit cbd379b100
38 changed files with 591 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/kernel/process.c
View File

@@ -39,6 +39,7 @@
#include <asm/thread_notify.h>
#include <asm/stacktrace.h>
#include <asm/mach/time.h>
#include <asm/tls.h>
#ifdef CONFIG_CC_STACKPROTECTOR
#include <linux/stackprotector.h>
@@ -374,7 +375,8 @@ copy_thread(unsigned long clone_flags, unsigned long stack_start,
clear_ptrace_hw_breakpoint(p);
if (clone_flags & CLONE_SETTLS)
thread->tp_value = childregs->ARM_r3;
thread->tp_value[0] = childregs->ARM_r3;
thread->tp_value[1] = get_tpuser();
thread_notify(THREAD_NOTIFY_COPY, thread);