diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/blackfin/kernel/time.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/blackfin/kernel/time.c')
| -rw-r--r-- | arch/blackfin/kernel/time.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/blackfin/kernel/time.c b/arch/blackfin/kernel/time.c index bd3b53da295e..13c1ee3e6408 100644 --- a/arch/blackfin/kernel/time.c +++ b/arch/blackfin/kernel/time.c | |||
| @@ -184,11 +184,3 @@ void __init time_init(void) | |||
| 184 | 184 | ||
| 185 | time_sched_init(timer_interrupt); | 185 | time_sched_init(timer_interrupt); |
| 186 | } | 186 | } |
| 187 | |||
| 188 | /* | ||
| 189 | * Scheduler clock - returns current time in nanosec units. | ||
| 190 | */ | ||
| 191 | unsigned long long sched_clock(void) | ||
| 192 | { | ||
| 193 | return (unsigned long long)jiffies *(NSEC_PER_SEC / HZ); | ||
| 194 | } | ||