diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-20 08:28:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-20 08:28:34 +0200 |
| commit | 26e42a020471ffc9a4086feb3900976a49cff42b (patch) | |
| tree | 5b6435fa4021b020a371f97bab4637364f13f3aa /include/linux | |
| parent | 821596a50aba6873ff4ea8fdf2b1515638c3c8a3 (diff) | |
| parent | ca9ae5ec4ef0ed13833b03297ab319676965492c (diff) | |
Merge tag 'arch-timer-gtdt' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux into timers/core
Pull arch timer GTDT support from Mark Rutland
- arch_timer cleanups and refactoring
- new common GTDT parser
- GTDT-based MMIO arch_timer support
- GTDT-based SBSA watchdog support
Fix up a trivial pr_err() conflict.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 9b05886f9773..31937249f8cc 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -595,6 +595,13 @@ enum acpi_reconfig_event { int acpi_reconfig_notifier_register(struct notifier_block *nb); int acpi_reconfig_notifier_unregister(struct notifier_block *nb); +#ifdef CONFIG_ACPI_GTDT +int acpi_gtdt_init(struct acpi_table_header *table, int *platform_timer_count); +int acpi_gtdt_map_ppi(int type); +bool acpi_gtdt_c3stop(int type); +int acpi_arch_timer_mem_init(struct arch_timer_mem *timer_mem, int *timer_count); +#endif + #else /* !CONFIG_ACPI */ #define acpi_disabled 1 |