ANDROID: GKI: fix up include/linux/pm.h to handle some abi changes
Fun with #ifdefs to work around the fact that 'unsigned long' and 'u64' are really different types, but are not different sizes. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I2eb1de10dc055995527614e46c28f2831b219c61
This commit is contained in:
parent
15fd930b92
commit
edd60868c3
1 changed files with 9 additions and 0 deletions
|
|
@ -598,7 +598,16 @@ struct dev_pm_info {
|
|||
#endif
|
||||
#ifdef CONFIG_PM
|
||||
struct hrtimer suspend_timer;
|
||||
|
||||
/*
|
||||
* See https://android-review.googlesource.com/c/kernel/common/+/1483579
|
||||
* for more info as to why this #ifdef is here...
|
||||
*/
|
||||
#ifdef __GENKSYMS__
|
||||
unsigned long timer_expires;
|
||||
#else
|
||||
u64 timer_expires;
|
||||
#endif
|
||||
struct work_struct work;
|
||||
wait_queue_head_t wait_queue;
|
||||
struct wake_irq *wakeirq;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue