diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-16 23:11:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 23:11:43 +0200 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /net/sched/cls_api.c | |
| parent | sparc32: Use PROM device probing for sun4m timer registers. (diff) | |
| parent | sparc64: Fix OOPS in psycho_pcierr_intr_other(). (diff) | |
| download | linux-2e57572a50a4de41c6cbc879a4866a312d4cd316.tar.xz linux-2e57572a50a4de41c6cbc879a4866a312d4cd316.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'net/sched/cls_api.c')
| -rw-r--r-- | net/sched/cls_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 5cafdd4c8018..8eb79e92e94c 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -205,7 +205,7 @@ replay: } } - root_lock = qdisc_root_lock(q); + root_lock = qdisc_root_sleeping_lock(q); if (tp == NULL) { /* Proto-tcf does not exist, create new one */ |