aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/osl.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index e72186340fec..c29076909efe 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -835,19 +835,9 @@ void acpi_os_stall(u32 us)
835 */ 835 */
836u64 acpi_os_get_timer(void) 836u64 acpi_os_get_timer(void)
837{ 837{
838 static u64 t; 838 u64 time_ns = ktime_to_ns(ktime_get());
839 839 do_div(time_ns, 100);
840#ifdef CONFIG_HPET 840 return time_ns;
841 /* TBD: use HPET if available */
842#endif
843
844#ifdef CONFIG_X86_PM_TIMER
845 /* TBD: default to PM timer if HPET was not available */
846#endif
847 if (!t)
848 printk(KERN_ERR PREFIX "acpi_os_get_timer() TBD\n");
849
850 return ++t;
851} 841}
852 842
853acpi_status acpi_os_read_port(acpi_io_address port, u32 * value, u32 width) 843acpi_status acpi_os_read_port(acpi_io_address port, u32 * value, u32 width)