projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ktest-fix-make-min-failed-build-for-real' of git://git.kernel.org/pub...
[deliverable/linux.git]
/
arch
/
s390
/
kernel
/
process.c
diff --git
a/arch/s390/kernel/process.c
b/arch/s390/kernel/process.c
index 3201ae447990c50052d7536d079e39286a77120d..e795933eb2cbaaf446d5ea62c0b43976d38479f0 100644
(file)
--- a/
arch/s390/kernel/process.c
+++ b/
arch/s390/kernel/process.c
@@
-29,7
+29,6
@@
#include <asm/irq.h>
#include <asm/timer.h>
#include <asm/nmi.h>
#include <asm/irq.h>
#include <asm/timer.h>
#include <asm/nmi.h>
-#include <asm/compat.h>
#include <asm/smp.h>
#include "entry.h"
#include <asm/smp.h>
#include "entry.h"
@@
-76,7
+75,6
@@
static void default_idle(void)
if (test_thread_flag(TIF_MCCK_PENDING)) {
local_mcck_enable();
local_irq_enable();
if (test_thread_flag(TIF_MCCK_PENDING)) {
local_mcck_enable();
local_irq_enable();
- s390_handle_mcck();
return;
}
trace_hardirqs_on();
return;
}
trace_hardirqs_on();
@@
-93,10
+91,12
@@
void cpu_idle(void)
for (;;) {
tick_nohz_idle_enter();
rcu_idle_enter();
for (;;) {
tick_nohz_idle_enter();
rcu_idle_enter();
- while (!need_resched())
+ while (!need_resched()
&& !test_thread_flag(TIF_MCCK_PENDING)
)
default_idle();
rcu_idle_exit();
tick_nohz_idle_exit();
default_idle();
rcu_idle_exit();
tick_nohz_idle_exit();
+ if (test_thread_flag(TIF_MCCK_PENDING))
+ s390_handle_mcck();
preempt_enable_no_resched();
schedule();
preempt_disable();
preempt_enable_no_resched();
schedule();
preempt_disable();
This page took
0.02541 seconds
and
5
git commands to generate.