Commit 5bc4b4bd authored by Linus Torvalds's avatar Linus Torvalds

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.
parent 9a276d67
...@@ -41,7 +41,7 @@ struct timezone { ...@@ -41,7 +41,7 @@ struct timezone {
* Have the 32 bit jiffies value wrap 5 minutes after boot * Have the 32 bit jiffies value wrap 5 minutes after boot
* so jiffies wrap bugs show up earlier. * 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 * Change timeval to jiffies, trying to avoid the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment