Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branches 'acpi-processor', 'acpi-hotplug' and 'acpi-battery'

Browse source 
* acpi-processor:
  ACPI / processor: Make acpi_cpu_soft_notify() process CPU FROZEN events

* acpi-hotplug:
  ACPI / hotplug: Check scan handlers in acpi_scan_hot_remove()

* acpi-battery:
  ACPI / battery: Fix warning message in acpi_battery_get_state()
This commit is contained in:
Rafael J. Wysocki 2014-08-10 16:23:33 +02:00
commit 21c806d9b1
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/acpi/battery.c
View file

@ -540,12 +540,12 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
*/ */
if (battery->capacity_now > battery->full_charge_capacity if (battery->capacity_now > battery->full_charge_capacity
&& battery->full_charge_capacity != ACPI_BATTERY_VALUE_UNKNOWN) { && battery->full_charge_capacity != ACPI_BATTERY_VALUE_UNKNOWN) {
battery->capacity_now = battery->full_charge_capacity;
if (battery->capacity_now != battery->design_capacity) if (battery->capacity_now != battery->design_capacity)
printk_once(KERN_WARNING FW_BUG printk_once(KERN_WARNING FW_BUG
"battery: reported current charge level (%d) " "battery: reported current charge level (%d) "
"is higher than reported maximum charge level (%d).\n", "is higher than reported maximum charge level (%d).\n",
battery->capacity_now, battery->full_charge_capacity); battery->capacity_now, battery->full_charge_capacity);
battery->capacity_now = battery->full_charge_capacity;
} }
if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags) if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)

1
drivers/acpi/processor_driver.c
View file

@ -120,6 +120,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
unsigned int cpu = (unsigned long)hcpu; unsigned int cpu = (unsigned long)hcpu;
struct acpi_processor *pr = per_cpu(processors, cpu); struct acpi_processor *pr = per_cpu(processors, cpu);
struct acpi_device *device; struct acpi_device *device;
action &= ~CPU_TASKS_FROZEN;
/* /*
* CPU_STARTING and CPU_DYING must not sleep. Return here since * CPU_STARTING and CPU_DYING must not sleep. Return here since

3
drivers/acpi/scan.c
View file

@ -353,7 +353,8 @@ static int acpi_scan_hot_remove(struct acpi_device *device)
unsigned long long sta; unsigned long long sta;
acpi_status status; acpi_status status;
if (device->handler->hotplug.demand_offline && !acpi_force_hot_remove) { if (device->handler && device->handler->hotplug.demand_offline
&& !acpi_force_hot_remove) {
if (!acpi_scan_is_offline(device, true)) if (!acpi_scan_is_offline(device, true))
return -EBUSY; return -EBUSY;
} else { } else {