diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /kernel/time/clocksource.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'kernel/time/clocksource.c')
| -rw-r--r-- | kernel/time/clocksource.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 5e18c6ab2c6a..4a310906b3e8 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
| @@ -39,7 +39,7 @@ void timecounter_init(struct timecounter *tc, | |||
| 39 | tc->cycle_last = cc->read(cc); | 39 | tc->cycle_last = cc->read(cc); |
| 40 | tc->nsec = start_tstamp; | 40 | tc->nsec = start_tstamp; |
| 41 | } | 41 | } |
| 42 | EXPORT_SYMBOL(timecounter_init); | 42 | EXPORT_SYMBOL_GPL(timecounter_init); |
| 43 | 43 | ||
| 44 | /** | 44 | /** |
| 45 | * timecounter_read_delta - get nanoseconds since last call of this function | 45 | * timecounter_read_delta - get nanoseconds since last call of this function |
| @@ -83,7 +83,7 @@ u64 timecounter_read(struct timecounter *tc) | |||
| 83 | 83 | ||
| 84 | return nsec; | 84 | return nsec; |
| 85 | } | 85 | } |
| 86 | EXPORT_SYMBOL(timecounter_read); | 86 | EXPORT_SYMBOL_GPL(timecounter_read); |
| 87 | 87 | ||
| 88 | u64 timecounter_cyc2time(struct timecounter *tc, | 88 | u64 timecounter_cyc2time(struct timecounter *tc, |
| 89 | cycle_t cycle_tstamp) | 89 | cycle_t cycle_tstamp) |
| @@ -105,7 +105,7 @@ u64 timecounter_cyc2time(struct timecounter *tc, | |||
| 105 | 105 | ||
| 106 | return nsec; | 106 | return nsec; |
| 107 | } | 107 | } |
| 108 | EXPORT_SYMBOL(timecounter_cyc2time); | 108 | EXPORT_SYMBOL_GPL(timecounter_cyc2time); |
| 109 | 109 | ||
| 110 | /*[Clocksource internal variables]--------- | 110 | /*[Clocksource internal variables]--------- |
| 111 | * curr_clocksource: | 111 | * curr_clocksource: |