Export symbols so they can be used by
drivers/staging/android/alarm-dev.c. So far this is built-in but LKM
support is planned (see drivers/staging/android/TODO).
Signed-off-by: Marcus Gelderie <[email protected]>
---
kernel/time/alarmtimer.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index f11d83b..90eca2f 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -303,6 +303,7 @@ void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
alarm->type = type;
alarm->state = ALARMTIMER_STATE_INACTIVE;
}
+EXPORT_SYMBOL(alarm_init);
/**
* alarm_start - Sets an alarm to fire
@@ -323,6 +324,7 @@ int alarm_start(struct alarm *alarm, ktime_t start)
spin_unlock_irqrestore(&base->lock, flags);
return ret;
}
+EXPORT_SYMBOL(alarm_start);
/**
* alarm_try_to_cancel - Tries to cancel an alarm timer
@@ -344,7 +346,7 @@ int alarm_try_to_cancel(struct alarm *alarm)
spin_unlock_irqrestore(&base->lock, flags);
return ret;
}
-
+EXPORT_SYMBOL(alarm_try_to_cancel);
/**
* alarm_cancel - Spins trying to cancel an alarm timer until it is done
@@ -361,7 +363,7 @@ int alarm_cancel(struct alarm *alarm)
cpu_relax();
}
}
-
+EXPORT_SYMBOL(alarm_cancel);
u64 alarm_forward(struct alarm *alarm, ktime_t now, ktime_t interval)
{
@@ -393,8 +395,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(alarm_forward);
/**
--
1.8.1.5
On 06/01/2013 09:39 AM, Marcus Gelderie wrote:
> Export symbols so they can be used by
> drivers/staging/android/alarm-dev.c. So far this is built-in but LKM
> support is planned (see drivers/staging/android/TODO).
>
> Signed-off-by: Marcus Gelderie <[email protected]>
These probably should be EXPORT_SYMBOL_GPL, no? Also there's a bunch of
new alarm functions that Todd Poynor that I have queued, which will
probably need similar.
thanks
-john
> ---
> kernel/time/alarmtimer.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
> index f11d83b..90eca2f 100644
> --- a/kernel/time/alarmtimer.c
> +++ b/kernel/time/alarmtimer.c
> @@ -303,6 +303,7 @@ void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
> alarm->type = type;
> alarm->state = ALARMTIMER_STATE_INACTIVE;
> }
> +EXPORT_SYMBOL(alarm_init);
>
> /**
> * alarm_start - Sets an alarm to fire
> @@ -323,6 +324,7 @@ int alarm_start(struct alarm *alarm, ktime_t start)
> spin_unlock_irqrestore(&base->lock, flags);
> return ret;
> }
> +EXPORT_SYMBOL(alarm_start);
>
> /**
> * alarm_try_to_cancel - Tries to cancel an alarm timer
> @@ -344,7 +346,7 @@ int alarm_try_to_cancel(struct alarm *alarm)
> spin_unlock_irqrestore(&base->lock, flags);
> return ret;
> }
> -
> +EXPORT_SYMBOL(alarm_try_to_cancel);
>
> /**
> * alarm_cancel - Spins trying to cancel an alarm timer until it is done
> @@ -361,7 +363,7 @@ int alarm_cancel(struct alarm *alarm)
> cpu_relax();
> }
> }
> -
> +EXPORT_SYMBOL(alarm_cancel);
>
> u64 alarm_forward(struct alarm *alarm, ktime_t now, ktime_t interval)
> {
> @@ -393,8 +395,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(alarm_forward);
>
>
> /**
On Mon, Jun 03, 2013 at 12:21:22PM -0700, John Stultz wrote:
> These probably should be EXPORT_SYMBOL_GPL, no? Also there's a bunch of
> new alarm functions that Todd Poynor that I have queued, which will
> probably need similar.
>
> thanks
> -john
Opps, yes they should, thanks. I've corrected that.
Your new alarm functions are not in the tree yet, are they? At least I didn't
find them.
cheers
Marcus
New patch below
-----------------
Export symbols so they can be used by
drivers/staging/android/alarm-dev.c. So far this is built-in but LKM
support is planned (see drivers/staging/android/TODO).
Signed-off-by: Marcus Gelderie <[email protected]>
---
kernel/time/alarmtimer.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index f11d83b..1e7d514 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -303,6 +303,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 alarm to fire
@@ -323,6 +324,7 @@ int alarm_start(struct alarm *alarm, ktime_t start)
spin_unlock_irqrestore(&base->lock, flags);
return ret;
}
+EXPORT_SYMBOL_GPL(alarm_start);
/**
* alarm_try_to_cancel - Tries to cancel an alarm timer
@@ -344,6 +346,7 @@ int alarm_try_to_cancel(struct alarm *alarm)
spin_unlock_irqrestore(&base->lock, flags);
return ret;
}
+EXPORT_SYMBOL_GPL(alarm_try_to_cancel);
/**
@@ -361,6 +364,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)
@@ -393,6 +397,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);
--
1.8.1.5
On 06/04/2013 12:32 AM, Marcus Gelderie wrote:
> On Mon, Jun 03, 2013 at 12:21:22PM -0700, John Stultz wrote:
>> These probably should be EXPORT_SYMBOL_GPL, no? Also there's a bunch of
>> new alarm functions that Todd Poynor that I have queued, which will
>> probably need similar.
>>
>> thanks
>> -john
> Opps, yes they should, thanks. I've corrected that.
>
> Your new alarm functions are not in the tree yet, are they? At least I didn't
> find them.
No, not yet.
Anyway, I went ahead and queued your patch and added the other exports.
thanks for the patch!
-john