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

5 files changed, 5 insertions, 5 deletions

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index c9b134cd1532..1891e4930dcc 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -355,7 +355,7 @@ static int multipath_remove_disk(mddev_t *mddev, int number)
                         goto abort;
                 }
                 p->rdev = NULL;
-                synchronize_kernel();
+                synchronize_rcu();
                 if (atomic_read(&rdev->nr_pending)) {
                         /* lost the race, try later */
                         err = -EBUSY;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index a389394b52f6..83380b5d6593 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -797,7 +797,7 @@ static int raid1_remove_disk(mddev_t *mddev, int number)
                         goto abort;
                 }
                 p->rdev = NULL;
-                synchronize_kernel();
+                synchronize_rcu();
                 if (atomic_read(&rdev->nr_pending)) {
                         /* lost the race, try later */
                         err = -EBUSY;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index b100bfe4fdca..e9dc2876a626 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -977,7 +977,7 @@ static int raid10_remove_disk(mddev_t *mddev, int number)
                         goto abort;
                 }
                 p->rdev = NULL;
-                synchronize_kernel();
+                synchronize_rcu();
                 if (atomic_read(&rdev->nr_pending)) {
                         /* lost the race, try later */
                         err = -EBUSY;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 52c3a81c4aa7..e96e2a10a9c9 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1873,7 +1873,7 @@ static int raid5_remove_disk(mddev_t *mddev, int number)
                         goto abort;
                 }
                 p->rdev = NULL;
-                synchronize_kernel();
+                synchronize_rcu();
                 if (atomic_read(&rdev->nr_pending)) {
                         /* lost the race, try later */
                         err = -EBUSY;
diff --git a/drivers/md/raid6main.c b/drivers/md/raid6main.c
index 7e30ab29691a..8a33f351e092 100644
--- a/drivers/md/raid6main.c
+++ b/drivers/md/raid6main.c
@@ -2038,7 +2038,7 @@ static int raid6_remove_disk(mddev_t *mddev, int number)
                         goto abort;
                 }
                 p->rdev = NULL;
-                synchronize_kernel();
+                synchronize_rcu();
                 if (atomic_read(&rdev->nr_pending)) {
                         /* lost the race, try later */
                         err = -EBUSY;