diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2018-01-11 04:14:45 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-01-11 04:14:45 -0800 |
| commit | e525ef12a4ba7da1569592615fddf082c51b2f3e (patch) | |
| tree | 5733d8ac1a78313edf973cf0e265f0fefafd4308 /arch/s390/kernel/runtime_instr.c | |
| parent | 1707cb3ff140dec01127669e1c88d5b850f272e4 (diff) | |
| parent | 80eb7ccae411759ac85501602aae882dede1c7fa (diff) | |
Merge "Merge android-4.4.104 (8bc4213) into msm-4.4"
Diffstat (limited to 'arch/s390/kernel/runtime_instr.c')
| -rw-r--r-- | arch/s390/kernel/runtime_instr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/runtime_instr.c b/arch/s390/kernel/runtime_instr.c index fffa0e5462af..70cdb03d4acd 100644 --- a/arch/s390/kernel/runtime_instr.c +++ b/arch/s390/kernel/runtime_instr.c @@ -47,11 +47,13 @@ void exit_thread_runtime_instr(void) { struct task_struct *task = current; + preempt_disable(); if (!task->thread.ri_cb) return; disable_runtime_instr(); kfree(task->thread.ri_cb); task->thread.ri_cb = NULL; + preempt_enable(); } SYSCALL_DEFINE1(s390_runtime_instr, int, command) @@ -62,9 +64,7 @@ SYSCALL_DEFINE1(s390_runtime_instr, int, command) return -EOPNOTSUPP; if (command == S390_RUNTIME_INSTR_STOP) { - preempt_disable(); exit_thread_runtime_instr(); - preempt_enable(); return 0; } |