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

Commit e7858f52 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'cpu_stop' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into sched/core

parents 27a9da65 bbf1bb3e

Documentation/RCU/torture.txt

+0 −10
Original line number Diff line number Diff line
@@ -182,16 +182,6 @@ Similarly, sched_expedited RCU provides the following: 
	sched_expedited-torture: Reader Pipe:  12660320201 95875 0 0 0 0 0 0 0 0 0

	sched_expedited-torture: Reader Batch:  12660424885 0 0 0 0 0 0 0 0 0 0

	sched_expedited-torture: Free-Block Circulation:  1090795 1090795 1090794 1090793 1090792 1090791 1090790 1090789 1090788 1090787 0

	state: -1 / 0:0 3:0 4:0



As before, the first four lines are similar to those for RCU.

The last line shows the task-migration state.  The first number is

-1 if synchronize_sched_expedited() is idle, -2 if in the process of

posting wakeups to the migration kthreads, and N when waiting on CPU N.

Each of the colon-separated fields following the "/" is a CPU:state pair.

Valid states are "0" for idle, "1" for waiting for quiescent state,

"2" for passed through quiescent state, and "3" when a race with a

CPU-hotplug event forces use of the synchronize_sched() primitive.





USAGE

arch/s390/kernel/time.c

+0 −1
Original line number Diff line number Diff line
@@ -391,7 +391,6 @@ static void __init time_init_wq(void) 
	if (time_sync_wq)

		return;

	time_sync_wq = create_singlethread_workqueue("timesync");

	stop_machine_create();

}



/*

drivers/xen/manage.c

+2 −12
Original line number Diff line number Diff line
@@ -80,12 +80,6 @@ static void do_suspend(void) 


	shutting_down = SHUTDOWN_SUSPEND;



	err = stop_machine_create();

	if (err) {

		printk(KERN_ERR "xen suspend: failed to setup stop_machine %d\n", err);

		goto out;

	}



#ifdef CONFIG_PREEMPT

	/* If the kernel is preemptible, we need to freeze all the processes

	   to prevent them from being in the middle of a pagetable update
@@ -93,7 +87,7 @@ static void do_suspend(void) 
	err = freeze_processes();

	if (err) {

		printk(KERN_ERR "xen suspend: freeze failed %d\n", err);

		goto out_destroy_sm;

		goto out;

	}

#endif
@@ -136,12 +130,8 @@ static void do_suspend(void) 
out_thaw:

#ifdef CONFIG_PREEMPT

	thaw_processes();



out_destroy_sm:

#endif

	stop_machine_destroy();



out:

#endif

	shutting_down = SHUTDOWN_INVALID;

}

#endif	/* CONFIG_PM_SLEEP */

include/linux/rcutiny.h

+0 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ static inline long rcu_batches_completed_bh(void) 
	return 0;

}



extern int rcu_expedited_torture_stats(char *page);



static inline void rcu_force_quiescent_state(void)

{

}

include/linux/rcutree.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct notifier_block; 
extern void rcu_sched_qs(int cpu);

extern void rcu_bh_qs(int cpu);

extern int rcu_needs_cpu(int cpu);

extern int rcu_expedited_torture_stats(char *page);



#ifdef CONFIG_TREE_PREEMPT_RCU