diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-09-28 08:50:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-09-28 08:50:09 +0200 |
| commit | 62d08aec6a9f4b45cc9cba1e3b2855995df133e6 (patch) | |
| tree | 51bddd857fb0eb03cd16c9ae17369e81b8f970f4 /arch | |
| parent | 82dfaa58a79c121be3611ce549dec806f2e6004f (diff) | |
| parent | 0c06a5d4b13cd66c833805a0d1db76b977944aac (diff) | |
| download | linux-62d08aec6a9f4b45cc9cba1e3b2855995df133e6.tar.bz2 | |
Merge branch 'context_tracking/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into sched/urgent
Pull context tracking ARM fix from Frederic Weisbecker.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/entry-header.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index de23a9beed13..39f89fbd5111 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -329,10 +329,10 @@ #ifdef CONFIG_CONTEXT_TRACKING .if \save stmdb sp!, {r0-r3, ip, lr} - bl user_exit + bl context_tracking_user_exit ldmia sp!, {r0-r3, ip, lr} .else - bl user_exit + bl context_tracking_user_exit .endif #endif .endm @@ -341,10 +341,10 @@ #ifdef CONFIG_CONTEXT_TRACKING .if \save stmdb sp!, {r0-r3, ip, lr} - bl user_enter + bl context_tracking_user_enter ldmia sp!, {r0-r3, ip, lr} .else - bl user_enter + bl context_tracking_user_enter .endif #endif .endm |