projects
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ce3ea1c
)
power: wakelock: call __get_wall_to_monotonic() instead of using wall_to_monotonic
author
Erik Gilling
<konkers@android.com>
Tue, 31 Aug 2010 01:22:20 +0000
(18:22 -0700)
committer
mgross
<mark.gross@intel.com>
Wed, 9 Nov 2011 20:05:59 +0000
(12:05 -0800)
Change-Id: I9e9c3b923bf9a22ffd48f80a72050289496e57d8
kernel/power/wakelock.c
patch
|
blob
|
history
diff --git
a/kernel/power/wakelock.c
b/kernel/power/wakelock.c
index
d3d7fd6
..
ee9781c
100644
(file)
--- a/
kernel/power/wakelock.c
+++ b/
kernel/power/wakelock.c
@@
-71,7
+71,7
@@
int get_expired_time(struct wake_lock *lock, ktime_t *expire_time)
if (timeout > 0)
return 0;
kt = current_kernel_time();
- tomono =
wall_to_monotonic
;
+ tomono =
__get_wall_to_monotonic()
;
} while (read_seqretry(&xtime_lock, seq));
jiffies_to_timespec(-timeout, &delta);
set_normalized_timespec(&ts, kt.tv_sec + tomono.tv_sec - delta.tv_sec,