diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /kernel/time.c | |
parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (diff) | |
parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) |
Merge branch 'master'
Diffstat (limited to 'kernel/time.c')
-rw-r--r-- | kernel/time.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/time.c b/kernel/time.c index ff8e7019c4c4..b00ddc71cedb 100644 --- a/kernel/time.c +++ b/kernel/time.c | |||
@@ -410,7 +410,7 @@ EXPORT_SYMBOL(current_kernel_time); | |||
410 | * current_fs_time - Return FS time | 410 | * current_fs_time - Return FS time |
411 | * @sb: Superblock. | 411 | * @sb: Superblock. |
412 | * | 412 | * |
413 | * Return the current time truncated to the time granuality supported by | 413 | * Return the current time truncated to the time granularity supported by |
414 | * the fs. | 414 | * the fs. |
415 | */ | 415 | */ |
416 | struct timespec current_fs_time(struct super_block *sb) | 416 | struct timespec current_fs_time(struct super_block *sb) |
@@ -421,11 +421,11 @@ struct timespec current_fs_time(struct super_block *sb) | |||
421 | EXPORT_SYMBOL(current_fs_time); | 421 | EXPORT_SYMBOL(current_fs_time); |
422 | 422 | ||
423 | /** | 423 | /** |
424 | * timespec_trunc - Truncate timespec to a granuality | 424 | * timespec_trunc - Truncate timespec to a granularity |
425 | * @t: Timespec | 425 | * @t: Timespec |
426 | * @gran: Granuality in ns. | 426 | * @gran: Granularity in ns. |
427 | * | 427 | * |
428 | * Truncate a timespec to a granuality. gran must be smaller than a second. | 428 | * Truncate a timespec to a granularity. gran must be smaller than a second. |
429 | * Always rounds down. | 429 | * Always rounds down. |
430 | * | 430 | * |
431 | * This function should be only used for timestamps returned by | 431 | * This function should be only used for timestamps returned by |