diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /arch/arm/kernel/entry-header.S | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'arch/arm/kernel/entry-header.S')
| -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 @@ | |||
| 329 | #ifdef CONFIG_CONTEXT_TRACKING | 329 | #ifdef CONFIG_CONTEXT_TRACKING |
| 330 | .if \save | 330 | .if \save |
| 331 | stmdb sp!, {r0-r3, ip, lr} | 331 | stmdb sp!, {r0-r3, ip, lr} |
| 332 | bl user_exit | 332 | bl context_tracking_user_exit |
| 333 | ldmia sp!, {r0-r3, ip, lr} | 333 | ldmia sp!, {r0-r3, ip, lr} |
| 334 | .else | 334 | .else |
| 335 | bl user_exit | 335 | bl context_tracking_user_exit |
| 336 | .endif | 336 | .endif |
| 337 | #endif | 337 | #endif |
| 338 | .endm | 338 | .endm |
| @@ -341,10 +341,10 @@ | |||
| 341 | #ifdef CONFIG_CONTEXT_TRACKING | 341 | #ifdef CONFIG_CONTEXT_TRACKING |
| 342 | .if \save | 342 | .if \save |
| 343 | stmdb sp!, {r0-r3, ip, lr} | 343 | stmdb sp!, {r0-r3, ip, lr} |
| 344 | bl user_enter | 344 | bl context_tracking_user_enter |
| 345 | ldmia sp!, {r0-r3, ip, lr} | 345 | ldmia sp!, {r0-r3, ip, lr} |
| 346 | .else | 346 | .else |
| 347 | bl user_enter | 347 | bl context_tracking_user_enter |
| 348 | .endif | 348 | .endif |
| 349 | #endif | 349 | #endif |
| 350 | .endm | 350 | .endm |