diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/idle.c | 6 | ||||
| -rw-r--r-- | kernel/time/tick-sched.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index 2489140a7c51..de0e786b2667 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c | |||
| @@ -97,12 +97,6 @@ void default_idle_call(void) | |||
| 97 | static int call_cpuidle(struct cpuidle_driver *drv, struct cpuidle_device *dev, | 97 | static int call_cpuidle(struct cpuidle_driver *drv, struct cpuidle_device *dev, |
| 98 | int next_state) | 98 | int next_state) |
| 99 | { | 99 | { |
| 100 | /* Fall back to the default arch idle method on errors. */ | ||
| 101 | if (next_state < 0) { | ||
| 102 | default_idle_call(); | ||
| 103 | return next_state; | ||
| 104 | } | ||
| 105 | |||
| 106 | /* | 100 | /* |
| 107 | * The idle task must be scheduled, it is pointless to go to idle, just | 101 | * The idle task must be scheduled, it is pointless to go to idle, just |
| 108 | * update no idle residency and return. | 102 | * update no idle residency and return. |
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 9cc20af58c76..9d7a053545f5 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
| @@ -387,7 +387,7 @@ void __init tick_nohz_init(void) | |||
| 387 | /* | 387 | /* |
| 388 | * NO HZ enabled ? | 388 | * NO HZ enabled ? |
| 389 | */ | 389 | */ |
| 390 | static int tick_nohz_enabled __read_mostly = 1; | 390 | int tick_nohz_enabled __read_mostly = 1; |
| 391 | unsigned long tick_nohz_active __read_mostly; | 391 | unsigned long tick_nohz_active __read_mostly; |
| 392 | /* | 392 | /* |
| 393 | * Enable / Disable tickless mode | 393 | * Enable / Disable tickless mode |
