|
@@ -69,6 +69,7 @@
|
|
* 2007-04-27 Russ Anderson <rja@sgi.com>
|
|
* 2007-04-27 Russ Anderson <rja@sgi.com>
|
|
* Support multiple cpus going through OS_MCA in the same event.
|
|
* Support multiple cpus going through OS_MCA in the same event.
|
|
*/
|
|
*/
|
|
|
|
+#include <linux/jiffies.h>
|
|
#include <linux/types.h>
|
|
#include <linux/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/init.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/sched.h>
|
|
@@ -293,7 +294,8 @@ static void ia64_mlogbuf_dump_from_init(void)
|
|
if (mlogbuf_finished)
|
|
if (mlogbuf_finished)
|
|
return;
|
|
return;
|
|
|
|
|
|
- if (mlogbuf_timestamp && (mlogbuf_timestamp + 30*HZ > jiffies)) {
|
|
|
|
|
|
+ if (mlogbuf_timestamp &&
|
|
|
|
+ time_before(jiffies, mlogbuf_timestamp + 30 * HZ)) {
|
|
printk(KERN_ERR "INIT: mlogbuf_dump is interrupted by INIT "
|
|
printk(KERN_ERR "INIT: mlogbuf_dump is interrupted by INIT "
|
|
" and the system seems to be messed up.\n");
|
|
" and the system seems to be messed up.\n");
|
|
ia64_mlogbuf_finish(0);
|
|
ia64_mlogbuf_finish(0);
|