Pull power management and ACPI fixes from Rafael Wysocki: "These are an ACPI device power management initialization fix (-stable material), two commits renaming stuff in the ACPI processor driver to make it more suitable for ARM64 processors and a new ACPI backlight blacklist entry. Specifics: - Fix ACPI power management intialization for device objects corresponding to devices that are not present at the init time (the _STA control method returns 0 for them) and therefore should not be regarded as power manageable (Rafael J Wysocki). - Rename a structure field and two functions used by the ACPI processor driver to make them less tied to architectures that use APICs (both x86 and ia64) and more suitable for ARM64 processors (Hanjun Guo). - Add a disable_native_backlight quirk for Dell XPS15 L521X designed in an unusual way preventing native backlight from working on that machine (Hans de Goede)" * tag 'pm+acpi-3.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / video: Add disable_native_backlight quirk for Dell XPS15 L521X ACPI / processor: Rename acpi_(un)map_lsapic() to acpi_(un)map_cpu() ACPI / processor: Convert apic_id to phys_id to make it arch agnostic ACPI / PM: Fix PM initialization for devices that are not present
Showing the changes to include/linux (1 of 9 files). Show all
Unified · Split
| @@ -147,8 +147,8 @@ void acpi_numa_arch_fixup(void); · 146 unmodified lines | ||
| 147 | 147 | |
| 148 | 148 | #ifdef CONFIG_ACPI_HOTPLUG_CPU |
| 149 | 149 | /* Arch dependent functions for cpu hotplug support */ |
| 150 | −int acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu); | |
| 151 | −int acpi_unmap_lsapic(int cpu); | |
| 150 | +int acpi_map_cpu(acpi_handle handle, int physid, int *pcpu); | |
| 151 | +int acpi_unmap_cpu(int cpu); | |
| 152 | 152 | #endif /* CONFIG_ACPI_HOTPLUG_CPU */ |
| 153 | 153 | |
| 154 | 154 | int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base); |