History

Merge branches 'acpi-apei', 'acpi-pmic', 'acpi-video' and 'acpi-dptf'

* acpi-apei: arm64: acpi: Make apei_claim_sea() synchronise with APEI's irq work ACPI: APEI: Kick the memory_failure() queue for synchronous errors mm/memory-failure: Add memory_failure_queue_kick() * acpi-pmic: ACPI / PMIC: Add i2c address for thermal control * acpi-video: ACPI: video: Use native backlight on Acer TravelMate 5735Z * acpi-dptf: ACPI: DPTF: Add battery participant driver ACPI: DPTF: Additional sysfs attributes for power participant driver

Rafael J. Wysocki committed 6 years ago

Commit 48ccded5 parents 228b79a 8fcc4ae cc0594c c41c36e 7b52b2010 files · +313 −30Browse files

Showing the changes to include/linux (1 of 10 files). Show all

Unified · Split

include/linux/mm.h+1−0
@@ -3012,6 +3012,7 @@ enum mf_flags { · 3011 unmodified lines
3012};3012};
3013extern int memory_failure(unsigned long pfn, int flags);3013extern int memory_failure(unsigned long pfn, int flags);
3014extern void memory_failure_queue(unsigned long pfn, int flags);3014extern void memory_failure_queue(unsigned long pfn, int flags);
3015extern void memory_failure_queue_kick(int cpu);
3015extern int unpoison_memory(unsigned long pfn);3016extern int unpoison_memory(unsigned long pfn);
3016extern int get_hwpoison_page(struct page *page);3017extern int get_hwpoison_page(struct page *page);
3017#define put_hwpoison_page(page) put_page(page)3018#define put_hwpoison_page(page) put_page(page)