diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-03 11:04:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-03 11:04:00 +0200 |
| commit | f320ead76a87a9c533f681ecce3bf3241d07c47d (patch) | |
| tree | 76ae437119088b180737670cb99a307e163a1ca0 /arch/um/kernel/process.c | |
| parent | 76695af20c015206cffb84b15912be6797d0cca2 (diff) | |
| parent | decd275e62d5eef4b947fab89652fa6afdadf2f2 (diff) | |
| download | linux-f320ead76a87a9c533f681ecce3bf3241d07c47d.tar.bz2 | |
Merge branch 'x86/asm' into locking/core
Upcoming changes to static keys is interacting/conflicting with the following
pending TSC commits in tip:x86/asm:
4ea1636b04db x86/asm/tsc: Rename native_read_tsc() to rdtsc()
...
So merge it into the locking tree to have a smoother resolution.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/um/kernel/process.c')
| -rw-r--r-- | arch/um/kernel/process.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 68b9119841cd..a6d922672b9f 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -90,12 +90,14 @@ void *__switch_to(struct task_struct *from, struct task_struct *to) void interrupt_end(void) { + struct pt_regs *regs = ¤t->thread.regs; + if (need_resched()) schedule(); if (test_thread_flag(TIF_SIGPENDING)) - do_signal(); + do_signal(regs); if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) - tracehook_notify_resume(¤t->thread.regs); + tracehook_notify_resume(regs); } void exit_thread(void) |