Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71169
b: refs/heads/master
c: 6fa6c3b
h: refs/heads/master
i:
  71167: f069433
v: v3
  • Loading branch information
Daniel Walker authored and Linus Torvalds committed Oct 18, 2007
1 parent b51110e commit 052fa08
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b8cc55493557f2259ac56ba0ac7f6804804f79a5
refs/heads/master: 6fa6c3b1d1780450a2f051937b3c6258eb1a8d5f
12 changes: 6 additions & 6 deletions trunk/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
*/
/*
* Modification history kernel/time.c
*
*
* 1993-09-02 Philip Gladstone
* Created file with time related functions from sched.c and adjtimex()
* Created file with time related functions from sched.c and adjtimex()
* 1993-10-08 Torsten Duwe
* adjtime interface update and CMOS clock write code
* 1995-08-13 Torsten Duwe
Expand Down Expand Up @@ -39,7 +39,7 @@
#include <asm/uaccess.h>
#include <asm/unistd.h>

/*
/*
* The timezone where the local system is located. Used as a default by some
* programs who obtain this value by using gettimeofday.
*/
Expand Down Expand Up @@ -72,7 +72,7 @@ asmlinkage long sys_time(time_t __user * tloc)
* why not move it into the appropriate arch directory (for those
* architectures that need it).
*/

asmlinkage long sys_stime(time_t __user *tptr)
{
struct timespec tv;
Expand Down Expand Up @@ -111,10 +111,10 @@ asmlinkage long sys_gettimeofday(struct timeval __user *tv, struct timezone __us
/*
* Adjust the time obtained from the CMOS to be UTC time instead of
* local time.
*
*
* This is ugly, but preferable to the alternatives. Otherwise we
* would either need to write a program to do it in /etc/rc (and risk
* confusion if the program gets run more than once; it would also be
* confusion if the program gets run more than once; it would also be
* hard to make the program warp the clock precisely n hours) or
* compile in the timezone information into the kernel. Bad, bad....
*
Expand Down

0 comments on commit 052fa08

Please sign in to comment.