From 307819578ec0bea57e88f4f7058c2f68e5f85883 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Thu, 9 Feb 2012 14:24:40 -0800 Subject: [PATCH] --- yaml --- r: 289073 b: refs/heads/master c: 7f9b98a39bdd12db051514eb0daff689c34b8b4e h: refs/heads/master i: 289071: 4aeb64f83386827074868c6f050077268df81011 v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/alarm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1c0024df6d70..6d95474f16ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2d3c6898abd6c5d69e6d1504413434df1ea2538 +refs/heads/master: 7f9b98a39bdd12db051514eb0daff689c34b8b4e diff --git a/trunk/drivers/staging/android/alarm.c b/trunk/drivers/staging/android/alarm.c index 642a22f01c1b..c68950b9e08f 100644 --- a/trunk/drivers/staging/android/alarm.c +++ b/trunk/drivers/staging/android/alarm.c @@ -341,7 +341,7 @@ static enum hrtimer_restart alarm_timer_triggered(struct hrtimer *timer) now = base->stopped ? base->stopped_time : hrtimer_cb_get_time(timer); now = ktime_sub(now, base->delta); - pr_alarm(INT, "alarm_timer_triggered type %d at %lld\n", + pr_alarm(INT, "alarm_timer_triggered type %ld at %lld\n", base - alarms, ktime_to_ns(now)); while (base->first) { @@ -364,7 +364,7 @@ static enum hrtimer_restart alarm_timer_triggered(struct hrtimer *timer) spin_lock_irqsave(&alarm_slock, flags); } if (!base->first) - pr_alarm(FLOW, "no more alarms of type %d\n", base - alarms); + pr_alarm(FLOW, "no more alarms of type %ld\n", base - alarms); update_timer_locked(base, true); spin_unlock_irqrestore(&alarm_slock, flags); return HRTIMER_NORESTART;