[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>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c
index 3720e77b465f..83e6a060668e 100644
--- a/drivers/s390/cio/airq.c
+++ b/drivers/s390/cio/airq.c
@@ -45,7 +45,7 @@ s390_register_adapter_interrupt (adapter_int_handler_t handler)
         else
                 ret = (cmpxchg(&adapter_handler, NULL, handler) ? -EBUSY : 0);
         if (!ret)
-                synchronize_kernel();
+                synchronize_sched();  /* Allow interrupts to complete. */
 
         sprintf (dbf_txt, "ret:%d", ret);
         CIO_TRACE_EVENT (4, dbf_txt);
@@ -65,7 +65,7 @@ s390_unregister_adapter_interrupt (adapter_int_handler_t handler)
                 ret = -EINVAL;
         else {
                 adapter_handler = NULL;
-                synchronize_kernel();
+                synchronize_sched();  /* Allow interrupts to complete. */
                 ret = 0;
         }
         sprintf (dbf_txt, "ret:%d", ret);