Merge branch 'master' of ssh://git.schlund.de/tst/mars

This commit is contained in:
jmann 2011-10-20 11:06:17 +02:00 committed by Thomas Schoebel-Theuer
parent 538bff0812
commit d9d150bd0f
4 changed files with 4 additions and 4 deletions

View File

@ -2,6 +2,8 @@
#ifndef BRICK_H
#define BRICK_H
#define msleep msleep_interruptible
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/sched.h>

2
mars.h
View File

@ -7,8 +7,6 @@
//#define MARS_TRACING // write runtime trace data to /mars/trace.csv
#define msleep msleep_interruptible
/////////////////////////////////////////////////////////////////////////
// include the generic brick infrastructure

View File

@ -130,7 +130,7 @@ static int check_watchdog(void *data)
unsigned long flags;
unsigned long now;
msleep_interruptible(5000);
msleep(5000);
traced_lock(&output->check_lock, flags);

View File

@ -358,7 +358,7 @@ static int sio_watchdog(void *data)
while (!kthread_should_stop()) {
int i;
msleep_interruptible(5000);
msleep(5000);
for (i = 0; i <= WITH_THREAD; i++) {
struct sio_threadinfo *tinfo = &output->tinfo[i];