summaryrefslogtreecommitdiffstats
path: root/net/core/pktgen.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-09-10 03:14:47 +0200
committerDmitry Torokhov <dtor_core@ameritech.net>2005-09-10 03:14:47 +0200
commitd344c5e0856ad03278d8700b503762dbc8b86e12 (patch)
treea6d893a643470a3c2580a58f3228a55fa1fd1d82 /net/core/pktgen.c
parentInput: HIDDEV - make HIDIOCSREPORT wait IO completion (diff)
parent[PATCH] md: fix BUG when raid10 rebuilds without enough drives (diff)
downloadlinux-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.xz
linux-d344c5e0856ad03278d8700b503762dbc8b86e12.zip
Manual merge with Linus
Diffstat (limited to 'net/core/pktgen.c')
-rw-r--r--net/core/pktgen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 8eb083b6041a..b3ad49fa7d78 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -503,7 +503,7 @@ static int pg_delay_d = 0;
static int pg_clone_skb_d = 0;
static int debug = 0;
-static spinlock_t _thread_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(_thread_lock);
static struct pktgen_thread *pktgen_threads = NULL;
static char module_fname[128];