diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-01 15:12:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-01 15:12:56 +0200 |
| commit | b262e60309e1b0eb25d300c7e739427d5316abb1 (patch) | |
| tree | bf319d78c79bb5cb617ff0c8340c73aa349bba15 /kernel/sched_rt.c | |
| parent | ipv6: almost identical frag hashing funcs combined (diff) | |
| parent | af_key: Free dumping state on socket close (diff) | |
| download | linux-b262e60309e1b0eb25d300c7e739427d5316abb1.tar.xz linux-b262e60309e1b0eb25d300c7e739427d5316abb1.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c
Diffstat (limited to 'kernel/sched_rt.c')
| -rw-r--r-- | kernel/sched_rt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 552310798dad..1113157b2058 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c @@ -350,6 +350,7 @@ static void __enable_runtime(struct rq *rq) spin_lock(&rt_rq->rt_runtime_lock); rt_rq->rt_runtime = rt_b->rt_runtime; rt_rq->rt_time = 0; + rt_rq->rt_throttled = 0; spin_unlock(&rt_rq->rt_runtime_lock); spin_unlock(&rt_b->rt_runtime_lock); } |