diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-12-07 12:15:33 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-07 12:15:33 +0100 |
| commit | 222e82bef4bd520a31d48c31ab24e49dd46daa46 (patch) | |
| tree | b6e73cad8e0b3a1c3e1acc537789e97aadaefa92 /arch/arm/lib/delay.c | |
| parent | Merge tag 'cputime-cleanups-for-mingo' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | tmpfs: fix shared mempolicy leak (diff) | |
| download | linux-222e82bef4bd520a31d48c31ab24e49dd46daa46.tar.xz linux-222e82bef4bd520a31d48c31ab24e49dd46daa46.zip | |
Merge branch 'linus' into sched/core
Pick up the autogroups fix and other fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/lib/delay.c')
| -rw-r--r-- | arch/arm/lib/delay.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c index 9d0a30032d7f..0dc53854a5d8 100644 --- a/arch/arm/lib/delay.c +++ b/arch/arm/lib/delay.c @@ -45,6 +45,7 @@ int read_current_timer(unsigned long *timer_val) *timer_val = delay_timer->read_current_timer(); return 0; } +EXPORT_SYMBOL_GPL(read_current_timer); static void __timer_delay(unsigned long cycles) { |