Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 27565d64a4e564e72c22d8c91a3cfcb9442383e8

Authored by Paul E. McKenney
Committed by Paul E. McKenney
1 parent 5e1ee6e101

rcu: Remove #ifdef CONFIG_SMP from TREE_RCU 

Now that both TINY_RCU and TINY_PREEMPT_RCU have been in place for awhile,
it is time to remove UP support from TREE_RCU, which is what this commit
does.

Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

Showing 2 changed files with 0 additions and 31 deletions Side-by-side Diff

... ... @@ -301,8 +301,6 @@
301 301 return &rsp->node[0];
302 302 }
303 303  
304   -#ifdef CONFIG_SMP
305   -
306 304 /*
307 305 * If the specified CPU is offline, tell the caller that it is in
308 306 * a quiescent state. Otherwise, whack it with a reschedule IPI.
... ... @@ -339,8 +337,6 @@
339 337 return 0;
340 338 }
341 339  
342   -#endif /* #ifdef CONFIG_SMP */
343   -
344 340 /*
345 341 * rcu_idle_enter_common - inform RCU that current CPU is moving towards idle
346 342 *
... ... @@ -606,8 +602,6 @@
606 602 return __get_cpu_var(rcu_dynticks).dynticks_nesting <= 1;
607 603 }
608 604  
609   -#ifdef CONFIG_SMP
610   -
611 605 /*
612 606 * Snapshot the specified CPU's dynticks counter so that we can later
613 607 * credit them with an implicit quiescent state. Return 1 if this CPU
... ... @@ -651,8 +645,6 @@
651 645 return rcu_implicit_offline_qs(rdp);
652 646 }
653 647  
654   -#endif /* #ifdef CONFIG_SMP */
655   -
656 648 static void record_gp_stall_check_time(struct rcu_state *rsp)
657 649 {
658 650 rsp->gp_start = jiffies;
... ... @@ -1517,8 +1509,6 @@
1517 1509 trace_rcu_utilization("End scheduler-tick");
1518 1510 }
1519 1511  
1520   -#ifdef CONFIG_SMP
1521   -
1522 1512 /*
1523 1513 * Scan the leaf rcu_node structures, processing dyntick state for any that
1524 1514 * have not yet encountered a quiescent state, using the function specified.
... ... @@ -1640,15 +1630,6 @@
1640 1630 raw_spin_unlock_irqrestore(&rsp->fqslock, flags);
1641 1631 trace_rcu_utilization("End fqs");
1642 1632 }
1643   -
1644   -#else /* #ifdef CONFIG_SMP */
1645   -
1646   -static void force_quiescent_state(struct rcu_state *rsp, int relaxed)
1647   -{
1648   - set_need_resched();
1649   -}
1650   -
1651   -#endif /* #else #ifdef CONFIG_SMP */
1652 1633  
1653 1634 /*
1654 1635 * This does the RCU core processing work for the specified rcu_state
kernel/rcutree_plugin.h
Diff comments   View file @ 27565d6
... ... @@ -1858,16 +1858,6 @@
1858 1858  
1859 1859 #endif /* #else #ifdef CONFIG_RCU_BOOST */
1860 1860  
1861   -#ifndef CONFIG_SMP
1862   -
1863   -void synchronize_sched_expedited(void)
1864   -{
1865   - cond_resched();
1866   -}
1867   -EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
1868   -
1869   -#else /* #ifndef CONFIG_SMP */
1870   -
1871 1861 static atomic_t sync_sched_expedited_started = ATOMIC_INIT(0);
1872 1862 static atomic_t sync_sched_expedited_done = ATOMIC_INIT(0);
1873 1863  
... ... @@ -1981,8 +1971,6 @@
1981 1971 put_online_cpus();
1982 1972 }
1983 1973 EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
1984   -
1985   -#endif /* #else #ifndef CONFIG_SMP */
1986 1974  
1987 1975 #if !defined(CONFIG_RCU_FAST_NO_HZ)
1988 1976