Merge tag 'remoteproc-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / kernel / time / alarmtimer.c

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 3e5cba274475df2ab70edb04d9695dfe28a945aa..eec50fcef9e4de6960a2ba44ae126f0455e2b703 100644 (file)
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -204,6 +204,7 @@ ktime_t alarm_expires_remaining(const struct alarm *alarm)
        struct alarm_base *base = &alarm_bases[alarm->type];
        return ktime_sub(alarm->node.expires, base->gettime());
 }
+EXPORT_SYMBOL_GPL(alarm_expires_remaining);
 
 #ifdef CONFIG_RTC_CLASS
 /**
@@ -309,6 +310,7 @@ void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
        alarm->type = type;
        alarm->state = ALARMTIMER_STATE_INACTIVE;
 }
+EXPORT_SYMBOL_GPL(alarm_init);
 
 /**
  * alarm_start - Sets an absolute alarm to fire
@@ -329,6 +331,7 @@ int alarm_start(struct alarm *alarm, ktime_t start)
        spin_unlock_irqrestore(&base->lock, flags);
        return ret;
 }
+EXPORT_SYMBOL_GPL(alarm_start);
 
 /**
  * alarm_start_relative - Sets a relative alarm to fire
@@ -342,6 +345,7 @@ int alarm_start_relative(struct alarm *alarm, ktime_t start)
        start = ktime_add(start, base->gettime());
        return alarm_start(alarm, start);
 }
+EXPORT_SYMBOL_GPL(alarm_start_relative);
 
 void alarm_restart(struct alarm *alarm)
 {
@@ -354,6 +358,7 @@ void alarm_restart(struct alarm *alarm)
        alarmtimer_enqueue(base, alarm);
        spin_unlock_irqrestore(&base->lock, flags);
 }
+EXPORT_SYMBOL_GPL(alarm_restart);
 
 /**
  * alarm_try_to_cancel - Tries to cancel an alarm timer
@@ -375,6 +380,7 @@ int alarm_try_to_cancel(struct alarm *alarm)
        spin_unlock_irqrestore(&base->lock, flags);
        return ret;
 }
+EXPORT_SYMBOL_GPL(alarm_try_to_cancel);
 
 
 /**
@@ -392,6 +398,7 @@ int alarm_cancel(struct alarm *alarm)
                cpu_relax();
        }
 }
+EXPORT_SYMBOL_GPL(alarm_cancel);
 
 
 u64 alarm_forward(struct alarm *alarm, ktime_t now, ktime_t interval)
@@ -424,6 +431,7 @@ u64 alarm_forward(struct alarm *alarm, ktime_t now, ktime_t interval)
        alarm->node.expires = ktime_add(alarm->node.expires, interval);
        return overrun;
 }
+EXPORT_SYMBOL_GPL(alarm_forward);
 
 u64 alarm_forward_now(struct alarm *alarm, ktime_t interval)
 {
@@ -431,7 +439,7 @@ u64 alarm_forward_now(struct alarm *alarm, ktime_t interval)
 
        return alarm_forward(alarm, base->gettime(), interval);
 }
-
+EXPORT_SYMBOL_GPL(alarm_forward_now);
 
 
 /**