diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-02 14:02:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-02 14:03:08 -0400 |
| commit | c9494727cf293ae2ec66af57547a3e79c724fec2 (patch) | |
| tree | 44ae197b64fa7530ee695a90ad31326dda06f1e1 /kernel/slow-work.c | |
| parent | 6427462bfa50f50dc6c088c07037264fcc73eca1 (diff) | |
| parent | 42be79e37e264557f12860fa4cc84b4de3685954 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: update to latest upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/slow-work.c')
| -rw-r--r-- | kernel/slow-work.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/slow-work.c b/kernel/slow-work.c index 7494bbf5a270..7d3f4fa9ef4f 100644 --- a/kernel/slow-work.c +++ b/kernel/slow-work.c | |||
| @@ -637,7 +637,7 @@ int delayed_slow_work_enqueue(struct delayed_slow_work *dwork, | |||
| 637 | goto cancelled; | 637 | goto cancelled; |
| 638 | 638 | ||
| 639 | /* the timer holds a reference whilst it is pending */ | 639 | /* the timer holds a reference whilst it is pending */ |
| 640 | ret = work->ops->get_ref(work); | 640 | ret = slow_work_get_ref(work); |
| 641 | if (ret < 0) | 641 | if (ret < 0) |
| 642 | goto cant_get_ref; | 642 | goto cant_get_ref; |
| 643 | 643 | ||