diff options
| author | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:25:31 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:25:31 -0400 |
| commit | f78e80209cf143be49f268c340431ae9fa3abb74 (patch) | |
| tree | 820fa64b688099dfdd93d27ba03252738ca5c7e2 /drivers/s390/cio/css.c | |
| parent | 4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d (diff) | |
| parent | 24342c34a022ee90839873d91396045e12ef1090 (diff) | |
Merge commit 'v2.6.27-rc5' into tip/oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
Diffstat (limited to 'drivers/s390/cio/css.c')
| -rw-r--r-- | drivers/s390/cio/css.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 46c021d880dc..51489eff6b0b 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c | |||
| @@ -477,7 +477,6 @@ void css_schedule_eval_all(void) | |||
| 477 | 477 | ||
| 478 | void css_wait_for_slow_path(void) | 478 | void css_wait_for_slow_path(void) |
| 479 | { | 479 | { |
| 480 | flush_workqueue(ccw_device_notify_work); | ||
| 481 | flush_workqueue(slow_path_wq); | 480 | flush_workqueue(slow_path_wq); |
| 482 | } | 481 | } |
| 483 | 482 | ||