git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
net
/
sched
/
estimator.c
diff --git
a/net/sched/estimator.c
b/net/sched/estimator.c
index
17eb079
..
5d3ae03
100644
(file)
--- a/
net/sched/estimator.c
+++ b/
net/sched/estimator.c
@@
-11,7
+11,7
@@
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/system.h>
-#include <
asm
/bitops.h>
+#include <
linux
/bitops.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@
-95,7
+95,7
@@
struct qdisc_estimator_head
static struct qdisc_estimator_head elist[EST_MAX_INTERVAL+1];
/* Estimator array lock */
static struct qdisc_estimator_head elist[EST_MAX_INTERVAL+1];
/* Estimator array lock */
-static
rwlock_t est_lock = RW_LOCK_UNLOCKED
;
+static
DEFINE_RWLOCK(est_lock)
;
static void est_timer(unsigned long arg)
{
static void est_timer(unsigned long arg)
{