diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-26 10:50:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-26 10:50:14 +0100 |
| commit | afe6ba0684ab75f5ee0306689e58b8b488319451 (patch) | |
| tree | 20e659b8c8319cfe8c46b0ef93037e1dacbd5f8f /arch/arm64/kernel/entry.S | |
| parent | 713c7153774c6b8b4cdc5bb13a0616e1f8ce7d0e (diff) | |
| parent | 9580f7022362bf717457b6b73de1e0ed0fede211 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-android-14.06
Diffstat (limited to 'arch/arm64/kernel/entry.S')
| -rw-r--r-- | arch/arm64/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 1fe70fa6160c..fa789169f98b 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -591,7 +591,7 @@ fast_work_pending: str x0, [sp, #S_X0] // returned x0 work_pending: tbnz x1, #TIF_NEED_RESCHED, work_resched - /* TIF_SIGPENDING, TIF_NOTIFY_RESUME or TIF_FOREIGN_FPSTATE case */ + /* TIF_SIGPENDING or TIF_NOTIFY_RESUME case */ ldr x2, [sp, #S_PSTATE] mov x0, sp // 'regs' tst x2, #PSR_MODE_MASK // user mode regs? |