From edd60868c356d645f7dacd8bb375a9a70d47c13a Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Sun, 1 Nov 2020 14:42:51 +0100
Subject: [PATCH] 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
---
 include/linux/pm.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/include/linux/pm.h b/include/linux/pm.h
index c1d21e9a864f..207c44e05bc3 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -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;