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

Commit 9b2619af authored by Paul E. McKenney's avatar Paul E. McKenney Committed by Ingo Molnar
Browse files

rcu: Clean up code to address Ingo's checkpatch feedback 



Move declarations and update storage classes to make checkpatch happy.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: laijs@cn.fujitsu.com
Cc: dipankar@in.ibm.com
Cc: akpm@linux-foundation.org
Cc: mathieu.desnoyers@polymtl.ca
Cc: josh@joshtriplett.org
Cc: dvhltc@us.ibm.com
Cc: niv@us.ibm.com
Cc: peterz@infradead.org
Cc: rostedt@goodmis.org
Cc: Valdis.Kletnieks@vt.edu
Cc: dhowells@redhat.com
LKML-Reference: <12537246441701-git-send-email->
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1eba8f84

include/linux/rcutree.h

+5 −1
Original line number Diff line number Diff line
@@ -30,10 +30,14 @@ 
#ifndef __LINUX_RCUTREE_H

#define __LINUX_RCUTREE_H



struct notifier_block;



extern void rcu_sched_qs(int cpu);

extern void rcu_bh_qs(int cpu);



extern int rcu_cpu_notify(struct notifier_block *self,

			  unsigned long action, void *hcpu);

extern int rcu_needs_cpu(int cpu);

extern int rcu_expedited_torture_stats(char *page);



#ifdef CONFIG_TREE_PREEMPT_RCU

kernel/rcupdate.c

+0 −3
Original line number Diff line number Diff line
@@ -259,9 +259,6 @@ static void rcu_migrate_callback(struct rcu_head *notused) 
		wake_up(&rcu_migrate_wq);

}



extern int rcu_cpu_notify(struct notifier_block *self,

			  unsigned long action, void *hcpu);



static int __cpuinit rcu_barrier_cpu_hotplug(struct notifier_block *self,

		unsigned long action, void *hcpu)

{

kernel/rcutorture.c

+1 −3
Original line number Diff line number Diff line
@@ -606,8 +606,6 @@ static struct rcu_torture_ops sched_ops_sync = { 
	.name		= "sched_sync"

};



extern int rcu_expedited_torture_stats(char *page);



static struct rcu_torture_ops sched_expedited_ops = {

	.init		= rcu_sync_torture_init,

	.cleanup	= NULL,
@@ -650,7 +648,7 @@ rcu_torture_writer(void *arg) 
		old_rp = rcu_torture_current;

		rp->rtort_mbtest = 1;

		rcu_assign_pointer(rcu_torture_current, rp);

		smp_wmb();

		smp_wmb(); /* Mods to old_rp must follow rcu_assign_pointer() */

		if (old_rp) {

			i = old_rp->rtort_pipe_count;

			if (i > RCU_TORTURE_PIPE_LEN)

kernel/rcutree.c

+0 −23
Original line number Diff line number Diff line
@@ -81,29 +81,6 @@ DEFINE_PER_CPU(struct rcu_data, rcu_sched_data); 
struct rcu_state rcu_bh_state = RCU_STATE_INITIALIZER(rcu_bh_state);

DEFINE_PER_CPU(struct rcu_data, rcu_bh_data);



/* Forward declarations for rcutree_plugin.h */

static inline void rcu_bootup_announce(void);

long rcu_batches_completed(void);

static void rcu_preempt_note_context_switch(int cpu);

static int rcu_preempted_readers(struct rcu_node *rnp);

#ifdef CONFIG_RCU_CPU_STALL_DETECTOR

static void rcu_print_task_stall(struct rcu_node *rnp);

#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */

static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp);

#ifdef CONFIG_HOTPLUG_CPU

static void rcu_preempt_offline_tasks(struct rcu_state *rsp,

				      struct rcu_node *rnp,

				      struct rcu_data *rdp);

static void rcu_preempt_offline_cpu(int cpu);

#endif /* #ifdef CONFIG_HOTPLUG_CPU */

static void rcu_preempt_check_callbacks(int cpu);

static void rcu_preempt_process_callbacks(void);

void call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu));

static int rcu_preempt_pending(int cpu);

static int rcu_preempt_needs_cpu(int cpu);

static void __cpuinit rcu_preempt_init_percpu_data(int cpu);

static void __init __rcu_init_preempt(void);





/*

 * Return true if an RCU grace period is in progress.  The ACCESS_ONCE()s

kernel/rcutree.h

+25 −1
Original line number Diff line number Diff line
@@ -270,5 +270,29 @@ extern struct rcu_state rcu_preempt_state; 
DECLARE_PER_CPU(struct rcu_data, rcu_preempt_data);

#endif /* #ifdef CONFIG_TREE_PREEMPT_RCU */



#endif /* #ifdef RCU_TREE_NONCORE */

#else /* #ifdef RCU_TREE_NONCORE */



/* Forward declarations for rcutree_plugin.h */

static inline void rcu_bootup_announce(void);

long rcu_batches_completed(void);

static void rcu_preempt_note_context_switch(int cpu);

static int rcu_preempted_readers(struct rcu_node *rnp);

#ifdef CONFIG_RCU_CPU_STALL_DETECTOR

static void rcu_print_task_stall(struct rcu_node *rnp);

#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */

static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp);

#ifdef CONFIG_HOTPLUG_CPU

static void rcu_preempt_offline_tasks(struct rcu_state *rsp,

				      struct rcu_node *rnp,

				      struct rcu_data *rdp);

static void rcu_preempt_offline_cpu(int cpu);

#endif /* #ifdef CONFIG_HOTPLUG_CPU */

static void rcu_preempt_check_callbacks(int cpu);

static void rcu_preempt_process_callbacks(void);

void call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu));

static int rcu_preempt_pending(int cpu);

static int rcu_preempt_needs_cpu(int cpu);

static void __cpuinit rcu_preempt_init_percpu_data(int cpu);

static void __init __rcu_init_preempt(void);



#endif /* #else #ifdef RCU_TREE_NONCORE */