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/char/ipmi | |
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/char/ipmi')
-rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 29de259a981e..44a7f13c788b 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -2199,7 +2199,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi) | |||
2199 | /* Wait until we know that we are out of any interrupt | 2199 | /* Wait until we know that we are out of any interrupt |
2200 | handlers might have been running before we freed the | 2200 | handlers might have been running before we freed the |
2201 | interrupt. */ | 2201 | interrupt. */ |
2202 | synchronize_kernel(); | 2202 | synchronize_sched(); |
2203 | 2203 | ||
2204 | if (new_smi->si_sm) { | 2204 | if (new_smi->si_sm) { |
2205 | if (new_smi->handlers) | 2205 | if (new_smi->handlers) |
@@ -2312,7 +2312,7 @@ static void __exit cleanup_one_si(struct smi_info *to_clean) | |||
2312 | /* Wait until we know that we are out of any interrupt | 2312 | /* Wait until we know that we are out of any interrupt |
2313 | handlers might have been running before we freed the | 2313 | handlers might have been running before we freed the |
2314 | interrupt. */ | 2314 | interrupt. */ |
2315 | synchronize_kernel(); | 2315 | synchronize_sched(); |
2316 | 2316 | ||
2317 | /* Wait for the timer to stop. This avoids problems with race | 2317 | /* Wait for the timer to stop. This avoids problems with race |
2318 | conditions removing the timer here. */ | 2318 | conditions removing the timer here. */ |