projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] PCI: MSI(X) save/restore for suspend/resume
[powerpc.git]
/
kernel
/
time.c
diff --git
a/kernel/time.c
b/kernel/time.c
index
e00a97b
..
b00ddc7
100644
(file)
--- a/
kernel/time.c
+++ b/
kernel/time.c
@@
-410,7
+410,7
@@
EXPORT_SYMBOL(current_kernel_time);
* current_fs_time - Return FS time
* @sb: Superblock.
*
* current_fs_time - Return FS time
* @sb: Superblock.
*
- * Return the current time truncated to the time granu
al
ity supported by
+ * Return the current time truncated to the time granu
lar
ity supported by
* the fs.
*/
struct timespec current_fs_time(struct super_block *sb)
* the fs.
*/
struct timespec current_fs_time(struct super_block *sb)
@@
-421,11
+421,11
@@
struct timespec current_fs_time(struct super_block *sb)
EXPORT_SYMBOL(current_fs_time);
/**
EXPORT_SYMBOL(current_fs_time);
/**
- * timespec_trunc - Truncate timespec to a granu
al
ity
+ * timespec_trunc - Truncate timespec to a granu
lar
ity
* @t: Timespec
* @t: Timespec
- * @gran: Granu
al
ity in ns.
+ * @gran: Granu
lar
ity in ns.
*
*
- * Truncate a timespec to a granu
al
ity. gran must be smaller than a second.
+ * Truncate a timespec to a granu
lar
ity. gran must be smaller than a second.
* Always rounds down.
*
* This function should be only used for timestamps returned by
* Always rounds down.
*
* This function should be only used for timestamps returned by
@@
-610,7
+610,7
@@
void set_normalized_timespec(struct timespec *ts, time_t sec, long nsec)
*
* Returns the timespec representation of the nsec parameter.
*/
*
* Returns the timespec representation of the nsec parameter.
*/
-struct timespec ns_to_timespec(const
nsec_t
nsec)
+struct timespec ns_to_timespec(const
s64
nsec)
{
struct timespec ts;
{
struct timespec ts;
@@
-630,7
+630,7
@@
struct timespec ns_to_timespec(const nsec_t nsec)
*
* Returns the timeval representation of the nsec parameter.
*/
*
* Returns the timeval representation of the nsec parameter.
*/
-struct timeval ns_to_timeval(const
nsec_t
nsec)
+struct timeval ns_to_timeval(const
s64
nsec)
{
struct timespec ts = ns_to_timespec(nsec);
struct timeval tv;
{
struct timespec ts = ns_to_timespec(nsec);
struct timeval tv;