Merge branch 'acpi-assorted'

* acpi-assorted: ACPI: implement acpi_os_get_timer() according the spec
git-mirror · Jun 29, 2013 · 5c0b1b2 · 5c0b1b2
2 parents d5ba5b1 + 1061906
commit 5c0b1b2
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
@@ -835,19 +835,9 @@ 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;
+	u64 time_ns = ktime_to_ns(ktime_get());
+	do_div(time_ns, 100);
+	return time_ns;
 }
 
 acpi_status acpi_os_read_port(acpi_io_address port, u32 * value, u32 width)