4 files changed, 19 insertions, 16 deletions

diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index cd827625cf07..01504c819e8f 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -684,7 +684,7 @@ static int acpi_sbs_add(struct acpi_device *device)
         if (!sbs_manager_broken) {
                 result = acpi_manager_get_info(sbs);
                 if (!result) {
-                        sbs->manager_present = 0;
+                        sbs->manager_present = 1;
                         for (id = 0; id < MAX_SBS_BAT; ++id)
                                 if ((sbs->batteries_supported & (1 << id)))
                                         acpi_battery_add(sbs, id);
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 7a73a279e179..61c417b9e53f 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -158,9 +158,18 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
         int entered_state;
 
         struct cpuidle_state *target_state = &drv->states[index];
+        bool broadcast = !!(target_state->flags & CPUIDLE_FLAG_TIMER_STOP);
         ktime_t time_start, time_end;
         s64 diff;
 
+        /*
+         * Tell the time framework to switch to a broadcast timer because our
+         * local timer will be shut down.  If a local timer is used from another
+         * CPU as a broadcast timer, this call may fail if it is not available.
+         */
+        if (broadcast && tick_broadcast_enter())
+                return -EBUSY;
+
         trace_cpu_idle_rcuidle(index, dev->cpu);
         time_start = ktime_get();
 
@@ -169,6 +178,13 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
         time_end = ktime_get();
         trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
 
+        if (broadcast) {
+                if (WARN_ON_ONCE(!irqs_disabled()))
+                        local_irq_disable();
+
+                tick_broadcast_exit();
+        }
+
         if (!cpuidle_state_is_coupled(dev, drv, entered_state))
                 local_irq_enable();
 
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index f5ca0e989bba..1c3002e1db20 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -124,7 +124,6 @@
 #ifndef ACPI_USE_SYSTEM_INTTYPES
 
 typedef unsigned char u8;
-typedef unsigned char u8;
 typedef unsigned short u16;
 typedef short s16;
 typedef COMPILER_DEPENDENT_UINT64 u64;
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index deef1caa94c6..fefcb1fa5160 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -81,7 +81,6 @@ static void cpuidle_idle_call(void)
         struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);
         struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);
         int next_state, entered_state;
-        unsigned int broadcast;
         bool reflect;
 
         /*
@@ -150,17 +149,6 @@ static void cpuidle_idle_call(void)
                 goto exit_idle;
         }
 
-        broadcast = drv->states[next_state].flags & CPUIDLE_FLAG_TIMER_STOP;
-
-        /*
-         * Tell the time framework to switch to a broadcast timer
-         * because our local timer will be shutdown. If a local timer
-         * is used from another cpu as a broadcast timer, this call may
-         * fail if it is not available
-         */
-        if (broadcast && tick_broadcast_enter())
-                goto use_default;
-
         /* Take note of the planned idle state. */
         idle_set_state(this_rq(), &drv->states[next_state]);
 
@@ -174,8 +162,8 @@ static void cpuidle_idle_call(void)
         /* The cpu is no longer idle or about to enter idle. */
         idle_set_state(this_rq(), NULL);
 
-        if (broadcast)
-                tick_broadcast_exit();
+        if (entered_state == -EBUSY)
+                goto use_default;
 
         /*
          * Give the governor an opportunity to reflect on the outcome