diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-29 01:05:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-29 01:05:32 -0700 |
| commit | 5bc4b4bd40341b87f12b2910ac83621ef74b228b (patch) | |
| tree | 0776793a53fd90d7008a34bd3de08b20dead01cb | |
| parent | 9a276d679ed8665e5fbbde5a7b5b6ba05cf07849 (diff) | |
Undo UML mis-merge of jiffies initialization.
Paolo Giarrusso points out that the UML merge incorrectly
caused INITIAL_JIFFIES to be reset back to zero, instead
of the debug value for getting an early jiffies wrap.
Fix it back up.
| -rw-r--r-- | include/linux/time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 8ab20a50bd1e..de41e12bbbff 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -41,7 +41,7 @@ struct timezone { * Have the 32 bit jiffies value wrap 5 minutes after boot * so jiffies wrap bugs show up earlier. */ -#define INITIAL_JIFFIES ((unsigned long)(0)) +#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ)) /* * Change timeval to jiffies, trying to avoid the |