ACPI Timer() opcode should return monotonically increasing clock with 100ns
granularity. Implement this with the help of ktime_get().

Signed-off-by: Mika Westerberg <mika.westerb...@linux.intel.com>
---
 drivers/acpi/osl.c |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 586e7e9..2a22170 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -835,19 +835,7 @@ void acpi_os_stall(u32 us)
  */
 u64 acpi_os_get_timer(void)
 {
-       static u64 t;
-
-#ifdef CONFIG_HPET
-       /* TBD: use HPET if available */
-#endif
-
-#ifdef CONFIG_X86_PM_TIMER
-       /* TBD: default to PM timer if HPET was not available */
-#endif
-       if (!t)
-               printk(KERN_ERR PREFIX "acpi_os_get_timer() TBD\n");
-
-       return ++t;
+       return ktime_to_ns(ktime_get()) / 100;
 }
 
 acpi_status acpi_os_read_port(acpi_io_address port, u32 * value, u32 width)
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to