From 0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 16 Apr 2005 15:25:31 -0700 Subject: [PATCH] Fix u32 vs. pm_message_t in x86-64 I thought I'm done with fixing u32 vs. pm_message_t ... unfortunately that turned out not to be the case... Here are fixes x86-64. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/x86_64/kernel/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/x86_64/kernel/time.c') diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 943a9bfba209..0e3b60e1ac5b 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c @@ -965,7 +965,7 @@ __setup("report_lost_ticks", time_setup); static long clock_cmos_diff; static unsigned long sleep_start; -static int timer_suspend(struct sys_device *dev, u32 state) +static int timer_suspend(struct sys_device *dev, pm_message_t state) { /* * Estimate time zone so that set_time can update the clock -- cgit v1.2.2