diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-01-19 23:51:37 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-19 23:51:37 +0100 |
| commit | 14f0290ba44de6ed435fea24bba26e7868421c66 (patch) | |
| tree | 449d32e4848007e3edbcab14fa8e09fdc66608ed /kernel/time.c | |
| parent | f5c88f56b35599ab9ff2d3398e0153e4cd4a4c82 (diff) | |
| parent | a5db219f4cf9f67995eabd53b81a1232c82f5852 (diff) | |
| download | kernel_samsung_smdk4412-14f0290ba44de6ed435fea24bba26e7868421c66.zip kernel_samsung_smdk4412-14f0290ba44de6ed435fea24bba26e7868421c66.tar.gz kernel_samsung_smdk4412-14f0290ba44de6ed435fea24bba26e7868421c66.tar.bz2 | |
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'kernel/time.c')
| -rw-r--r-- | kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time.c b/kernel/time.c index ba9b338..3217435 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -238,7 +238,7 @@ EXPORT_SYMBOL(current_fs_time); * Avoid unnecessary multiplications/divisions in the * two most common HZ cases: */ -unsigned int inline jiffies_to_msecs(const unsigned long j) +inline unsigned int jiffies_to_msecs(const unsigned long j) { #if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ) return (MSEC_PER_SEC / HZ) * j; @@ -254,7 +254,7 @@ unsigned int inline jiffies_to_msecs(const unsigned long j) } EXPORT_SYMBOL(jiffies_to_msecs); -unsigned int inline jiffies_to_usecs(const unsigned long j) +inline unsigned int jiffies_to_usecs(const unsigned long j) { #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) return (USEC_PER_SEC / HZ) * j; |