diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 12:04:45 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 12:04:45 -0400 |
| commit | fe47784ba5cbb6b713c013e046859946789b45e4 (patch) | |
| tree | 6384958d55e29be0d2eb8ae78fa437c10636d8d6 /drivers/s390/cio/css.c | |
| parent | 83b8e28b14d63db928cb39e5c5ed2a548246bd71 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/xsave
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
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 | ||