Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbd568a3 authored by Paul E. McKenney's avatar Paul E. McKenney Committed by Linus Torvalds
Browse files

[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: default avatarPaul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9b06e818

arch/i386/oprofile/nmi_timer_int.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static void timer_stop(void) 
{

	enable_timer_nmi_watchdog();

	unset_nmi_callback();

	synchronize_kernel();

	synchronize_sched();  /* Allow already-started NMIs to complete. */

}

arch/ppc64/kernel/HvLpEvent.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int HvLpEvent_unregisterHandler( HvLpEvent_Type eventType ) 
			/* We now sleep until all other CPUs have scheduled. This ensures that

			 * the deletion is seen by all other CPUs, and that the deleted handler

			 * isn't still running on another CPU when we return. */

			synchronize_kernel();

			synchronize_rcu();

		}

	}

	return rc;

drivers/acpi/processor_idle.c

+1 −1
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ int acpi_processor_cst_has_changed (struct acpi_processor *pr) 


	/* Fall back to the default idle loop */

	pm_idle = pm_idle_save;

	synchronize_kernel();

	synchronize_sched();  /* Relies on interrupts forcing exit from idle. */



	pr->flags.power = 0;

	result = acpi_processor_get_power_info(pr);

drivers/char/ipmi/ipmi_si_intf.c

+2 −2
Original line number Diff line number Diff line
@@ -2199,7 +2199,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi) 
	/* Wait until we know that we are out of any interrupt

	   handlers might have been running before we freed the

	   interrupt. */

	synchronize_kernel();

	synchronize_sched();



	if (new_smi->si_sm) {

		if (new_smi->handlers)
@@ -2312,7 +2312,7 @@ static void __exit cleanup_one_si(struct smi_info *to_clean) 
	/* Wait until we know that we are out of any interrupt

	   handlers might have been running before we freed the

	   interrupt. */

	synchronize_kernel();

	synchronize_sched();



	/* Wait for the timer to stop.  This avoids problems with race

	   conditions removing the timer here. */

drivers/input/keyboard/atkbd.c

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ static void atkbd_disconnect(struct serio *serio) 
	atkbd_disable(atkbd);



	/* make sure we don't have a command in flight */

	synchronize_kernel();

	synchronize_sched();  /* Allow atkbd_interrupt()s to complete. */

	flush_scheduled_work();



	device_remove_file(&serio->dev, &atkbd_attr_extra);