diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-14 11:32:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-14 11:32:30 +0200 |
| commit | 05cfbd66d07c44865983c8b65ae9d0037d874206 (patch) | |
| tree | 084b665cc97b47d1592fe76ea0a39a7753288a02 /fs/udf/udftime.c | |
| parent | 31c9a24ec82926fcae49483e53566d231e705057 (diff) | |
| parent | ef631b0ca01655d24e9ca7e199262c4a46416a26 (diff) | |
Merge branch 'core/urgent' into core/rcu
Merge reason: new patches to be queued up depend on:
ef631b0: rcu: Make hierarchical RCU less IPI-happy
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/udf/udftime.c')
| -rw-r--r-- | fs/udf/udftime.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c index 5f811655c9b5..b8c828c4d200 100644 --- a/fs/udf/udftime.c +++ b/fs/udf/udftime.c @@ -85,7 +85,8 @@ extern struct timezone sys_tz; #define SECS_PER_HOUR (60 * 60) #define SECS_PER_DAY (SECS_PER_HOUR * 24) -struct timespec *udf_disk_stamp_to_time(struct timespec *dest, timestamp src) +struct timespec * +udf_disk_stamp_to_time(struct timespec *dest, struct timestamp src) { int yday; u16 typeAndTimezone = le16_to_cpu(src.typeAndTimezone); @@ -116,7 +117,8 @@ struct timespec *udf_disk_stamp_to_time(struct timespec *dest, timestamp src) return dest; } -timestamp *udf_time_to_disk_stamp(timestamp *dest, struct timespec ts) +struct timestamp * +udf_time_to_disk_stamp(struct timestamp *dest, struct timespec ts) { long int days, rem, y; const unsigned short int *ip; |