Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / net / tux / logger.c

diff --git a/net/tux/logger.c b/net/tux/logger.c
index 67ef7c1..c0c2cc3 100644 (file)
--- a/net/tux/logger.c
+++ b/net/tux/logger.c
@@ -29,7 +29,7 @@
  *
  ****************************************************************/
 
-static DEFINE_SPINLOCK(log_lock);
+static spinlock_t log_lock = SPIN_LOCK_UNLOCKED;
 static unsigned int log_head, log_tail;
 static char * log_buffer = NULL;
 static DECLARE_WAIT_QUEUE_HEAD(log_wait);
@@ -767,10 +767,6 @@ static int logger_thread (void *data)
        if (log_buffer)
                TUX_BUG();
        log_buffer = vmalloc(LOG_LEN);
-       if (!log_buffer) {
-               TUX_BUG();
-               goto out;
-       }
        memset(log_buffer, 0, LOG_LEN);
        log_head = log_tail = 0;
 
@@ -808,7 +804,7 @@ static int logger_thread (void *data)
        log_buffer = NULL;
        stop_logger = 0;
        wake_up(&stop_logger_wait);
-out:
+
        set_fs(oldmm);
 
        return 0;