Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 17583
b: refs/heads/master
c: 1ad106c
h: refs/heads/master
i:
  17581: 887f607
  17579: bcde8a1
  17575: c0b4ba5
  17567: fc1e116
v: v3
  • Loading branch information
Ingo Molnar authored and Linus Torvalds committed Jan 10, 2006
1 parent 8ef996f commit deec2d8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 15 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: 0c4f6eeca98a805fd0c2536b55039383eb56d2ba
refs/heads/master: 1ad106ca185e66dc312518e18e2ffaedf376a160
23 changes: 9 additions & 14 deletions trunk/include/linux/time.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,30 +100,25 @@ struct itimerval {
struct timeval it_value; /* current value */
};


/*
* The IDs of the various system clocks (for POSIX.1b interval timers).
*/
#define CLOCK_REALTIME 0
#define CLOCK_MONOTONIC 1
#define CLOCK_PROCESS_CPUTIME_ID 2
#define CLOCK_THREAD_CPUTIME_ID 3
#define CLOCK_REALTIME 0
#define CLOCK_MONOTONIC 1
#define CLOCK_PROCESS_CPUTIME_ID 2
#define CLOCK_THREAD_CPUTIME_ID 3

/*
* The IDs of various hardware clocks
*/


#define CLOCK_SGI_CYCLE 10
#define MAX_CLOCKS 16
#define CLOCKS_MASK (CLOCK_REALTIME | CLOCK_MONOTONIC)
#define CLOCKS_MONO (CLOCK_MONOTONIC)
#define CLOCK_SGI_CYCLE 10
#define MAX_CLOCKS 16
#define CLOCKS_MASK (CLOCK_REALTIME | CLOCK_MONOTONIC)
#define CLOCKS_MONO CLOCK_MONOTONIC

/*
* The various flags for setting POSIX.1b interval timers.
*/

#define TIMER_ABSTIME 0x01

#define TIMER_ABSTIME 0x01

#endif

0 comments on commit deec2d8

Please sign in to comment.