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/timecompare.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'kernel/time/timecompare.c')
| -rw-r--r-- | kernel/time/timecompare.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/timecompare.c b/kernel/time/timecompare.c index 71e7f1a19156..96ff643a5a59 100644 --- a/kernel/time/timecompare.c +++ b/kernel/time/timecompare.c | |||
| @@ -40,7 +40,7 @@ ktime_t timecompare_transform(struct timecompare *sync, | |||
| 40 | 40 | ||
| 41 | return ns_to_ktime(nsec); | 41 | return ns_to_ktime(nsec); |
| 42 | } | 42 | } |
| 43 | EXPORT_SYMBOL(timecompare_transform); | 43 | EXPORT_SYMBOL_GPL(timecompare_transform); |
| 44 | 44 | ||
| 45 | int timecompare_offset(struct timecompare *sync, | 45 | int timecompare_offset(struct timecompare *sync, |
| 46 | s64 *offset, | 46 | s64 *offset, |
| @@ -131,7 +131,7 @@ int timecompare_offset(struct timecompare *sync, | |||
| 131 | 131 | ||
| 132 | return used; | 132 | return used; |
| 133 | } | 133 | } |
| 134 | EXPORT_SYMBOL(timecompare_offset); | 134 | EXPORT_SYMBOL_GPL(timecompare_offset); |
| 135 | 135 | ||
| 136 | void __timecompare_update(struct timecompare *sync, | 136 | void __timecompare_update(struct timecompare *sync, |
| 137 | u64 source_tstamp) | 137 | u64 source_tstamp) |
| @@ -188,4 +188,4 @@ void __timecompare_update(struct timecompare *sync, | |||
| 188 | } | 188 | } |
| 189 | } | 189 | } |
| 190 | } | 190 | } |
| 191 | EXPORT_SYMBOL(__timecompare_update); | 191 | EXPORT_SYMBOL_GPL(__timecompare_update); |