diff options
author | Paul E. McKenney <paulmck@us.ibm.com> | 2005-05-01 11:59:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 11:59:04 -0400 |
commit | fbd568a3e61a7decb8a754ad952aaa5b5c82e9e5 (patch) | |
tree | 40a44149a9b6a39eac5481380e2212f9b9b74eb2 /drivers/input/keyboard/atkbd.c | |
parent | 9b06e818985d139fd9e82c28297f7744e1b484e1 (diff) |
[PATCH] Change synchronize_kernel to _rcu and _sched
This patch changes calls to synchronize_kernel(), deprecated in the earlier
"Deprecate synchronize_kernel, GPL replacement" patch to instead call the new
synchronize_rcu() and synchronize_sched() APIs.
Signed-off-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/input/keyboard/atkbd.c')
-rw-r--r-- | drivers/input/keyboard/atkbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index f7304f0ce542..ff66ed4ee2cd 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c | |||
@@ -678,7 +678,7 @@ static void atkbd_disconnect(struct serio *serio) | |||
678 | atkbd_disable(atkbd); | 678 | atkbd_disable(atkbd); |
679 | 679 | ||
680 | /* make sure we don't have a command in flight */ | 680 | /* make sure we don't have a command in flight */ |
681 | synchronize_kernel(); | 681 | synchronize_sched(); /* Allow atkbd_interrupt()s to complete. */ |
682 | flush_scheduled_work(); | 682 | flush_scheduled_work(); |
683 | 683 | ||
684 | device_remove_file(&serio->dev, &atkbd_attr_extra); | 684 | device_remove_file(&serio->dev, &atkbd_attr_extra); |