diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-29 09:03:44 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-29 09:03:44 -0400 |
| commit | 5c0b1b2003362c9015ee3324816c0966efaa0f88 (patch) | |
| tree | 86beaa1096b91bd102752c4df5be78942857200e | |
| parent | d5ba5b141dae17155d12b897f2eedeaf6800db7c (diff) | |
| parent | 10619066a353f27fe3700a448fa2b21643687840 (diff) | |
Merge branch 'acpi-assorted'
* acpi-assorted:
ACPI: implement acpi_os_get_timer() according the spec
| -rw-r--r-- | drivers/acpi/osl.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index da6b6634e5b3..6ab2c3505520 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -835,19 +835,9 @@ void acpi_os_stall(u32 us) | |||
| 835 | */ | 835 | */ |
| 836 | u64 acpi_os_get_timer(void) | 836 | u64 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 | ||
| 853 | acpi_status acpi_os_read_port(acpi_io_address port, u32 * value, u32 width) | 843 | acpi_status acpi_os_read_port(acpi_io_address port, u32 * value, u32 width) |