diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
| commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
| tree | 9b08af78085334af44414adafe0096276f8fe0ff /arch/m32r/kernel/time.c | |
| parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
| parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) | |
Merge ARM fixes
Diffstat (limited to 'arch/m32r/kernel/time.c')
| -rw-r--r-- | arch/m32r/kernel/time.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c index a09038282c78..3858c9f39ba5 100644 --- a/arch/m32r/kernel/time.c +++ b/arch/m32r/kernel/time.c | |||
| @@ -286,11 +286,3 @@ void __init time_init(void) | |||
| 286 | #error no chip configuration | 286 | #error no chip configuration |
| 287 | #endif | 287 | #endif |
| 288 | } | 288 | } |
| 289 | |||
| 290 | /* | ||
| 291 | * Scheduler clock - returns current time in nanosec units. | ||
| 292 | */ | ||
| 293 | unsigned long long sched_clock(void) | ||
| 294 | { | ||
| 295 | return (unsigned long long)jiffies * (1000000000 / HZ); | ||
| 296 | } | ||