Skip to content

Commit a71fca5

Browse files
paulmckIngo Molnar
paulmck
authored and
Ingo Molnar
committed
rcu: Fix whitespace inconsistencies
Fix a number of whitespace ^Ierrors in the include/linux/rcu* and the kernel/rcu* files. Signed-off-by: Paul 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 LKML-Reference: <20090918172819.GA24405@linux.vnet.ibm.com> [ did more checkpatch fixlets ] Signed-off-by: Ingo Molnar <mingo@elte.hu>
1 parent 49e2912 commit a71fca5

File tree

9 files changed

+26
-25
lines changed

9 files changed

+26
-25
lines changed

‎include/linux/rculist_nulls.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static inline void hlist_nulls_add_head_rcu(struct hlist_nulls_node *n,
102102
*/
103103
#define hlist_nulls_for_each_entry_rcu(tpos, pos, head, member) \
104104
for (pos = rcu_dereference((head)->first); \
105-
(!is_a_nulls(pos)) && \
105+
(!is_a_nulls(pos)) && \
106106
({ tpos = hlist_nulls_entry(pos, typeof(*tpos), member); 1; }); \
107107
pos = rcu_dereference(pos->next))
108108

‎include/linux/rcupdate.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Read-Copy Update mechanism for mutual exclusion
2+
* Read-Copy Update mechanism for mutual exclusion
33
*
44
* This program is free software; you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License as published by
@@ -18,15 +18,15 @@
1818
* Copyright IBM Corporation, 2001
1919
*
2020
* Author: Dipankar Sarma <dipankar@in.ibm.com>
21-
*
21+
*
2222
* Based on the original work by Paul McKenney <paulmck@us.ibm.com>
2323
* and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
2424
* Papers:
2525
* http://www.rdrop.com/users/paulmck/paper/rclockpdcsproof.pdf
2626
* http://lse.sourceforge.net/locking/rclock_OLS.2001.05.01c.sc.pdf (OLS2001)
2727
*
2828
* For detailed explanation of Read-Copy Update mechanism see -
29-
* http://lse.sourceforge.net/locking/rcupdate.html
29+
* http://lse.sourceforge.net/locking/rcupdate.html
3030
*
3131
*/
3232

‎include/linux/rcutree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
2525
*
2626
* For detailed explanation of Read-Copy Update mechanism see -
27-
* Documentation/RCU
27+
* Documentation/RCU
2828
*/
2929

3030
#ifndef __LINUX_RCUTREE_H

‎kernel/rcupdate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
*
2020
* Authors: Dipankar Sarma <dipankar@in.ibm.com>
2121
* Manfred Spraul <manfred@colorfullife.com>
22-
*
22+
*
2323
* Based on the original work by Paul McKenney <paulmck@us.ibm.com>
2424
* and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
2525
* Papers:
2626
* http://www.rdrop.com/users/paulmck/paper/rclockpdcsproof.pdf
2727
* http://lse.sourceforge.net/locking/rclock_OLS.2001.05.01c.sc.pdf (OLS2001)
2828
*
2929
* For detailed explanation of Read-Copy Update mechanism see -
30-
* http://lse.sourceforge.net/locking/rcupdate.html
30+
* http://lse.sourceforge.net/locking/rcupdate.html
3131
*
3232
*/
3333
#include <linux/types.h>

‎kernel/rcutorture.c

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Copyright (C) IBM Corporation, 2005, 2006
1919
*
2020
* Authors: Paul E. McKenney <paulmck@us.ibm.com>
21-
* Josh Triplett <josh@freedesktop.org>
21+
* Josh Triplett <josh@freedesktop.org>
2222
*
2323
* See also: Documentation/RCU/torture.txt
2424
*/
@@ -50,7 +50,7 @@
5050

5151
MODULE_LICENSE("GPL");
5252
MODULE_AUTHOR("Paul E. McKenney <paulmck@us.ibm.com> and "
53-
"Josh Triplett <josh@freedesktop.org>");
53+
"Josh Triplett <josh@freedesktop.org>");
5454

5555
static int nreaders = -1; /* # reader threads, defaults to 2*ncpus */
5656
static int nfakewriters = 4; /* # fake writer threads */
@@ -110,8 +110,8 @@ struct rcu_torture {
110110
};
111111

112112
static LIST_HEAD(rcu_torture_freelist);
113-
static struct rcu_torture *rcu_torture_current = NULL;
114-
static long rcu_torture_current_version = 0;
113+
static struct rcu_torture *rcu_torture_current;
114+
static long rcu_torture_current_version;
115115
static struct rcu_torture rcu_tortures[10 * RCU_TORTURE_PIPE_LEN];
116116
static DEFINE_SPINLOCK(rcu_torture_lock);
117117
static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
@@ -124,11 +124,11 @@ static atomic_t n_rcu_torture_alloc_fail;
124124
static atomic_t n_rcu_torture_free;
125125
static atomic_t n_rcu_torture_mberror;
126126
static atomic_t n_rcu_torture_error;
127-
static long n_rcu_torture_timers = 0;
127+
static long n_rcu_torture_timers;
128128
static struct list_head rcu_torture_removed;
129129
static cpumask_var_t shuffle_tmp_mask;
130130

131-
static int stutter_pause_test = 0;
131+
static int stutter_pause_test;
132132

133133
#if defined(MODULE) || defined(CONFIG_RCU_TORTURE_TEST_RUNNABLE)
134134
#define RCUTORTURE_RUNNABLE_INIT 1
@@ -267,7 +267,8 @@ struct rcu_torture_ops {
267267
int irq_capable;
268268
char *name;
269269
};
270-
static struct rcu_torture_ops *cur_ops = NULL;
270+
271+
static struct rcu_torture_ops *cur_ops;
271272

272273
/*
273274
* Definitions for rcu torture testing.
@@ -342,8 +343,8 @@ static struct rcu_torture_ops rcu_ops = {
342343
.sync = synchronize_rcu,
343344
.cb_barrier = rcu_barrier,
344345
.stats = NULL,
345-
.irq_capable = 1,
346-
.name = "rcu"
346+
.irq_capable = 1,
347+
.name = "rcu"
347348
};
348349

349350
static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
@@ -641,7 +642,8 @@ rcu_torture_writer(void *arg)
641642

642643
do {
643644
schedule_timeout_uninterruptible(1);
644-
if ((rp = rcu_torture_alloc()) == NULL)
645+
rp = rcu_torture_alloc();
646+
if (rp == NULL)
645647
continue;
646648
rp->rtort_pipe_count = 0;
647649
udelay(rcu_random(&rand) & 0x3ff);
@@ -1113,7 +1115,7 @@ rcu_torture_init(void)
11131115
printk(KERN_ALERT "rcutorture: invalid torture type: \"%s\"\n",
11141116
torture_type);
11151117
mutex_unlock(&fullstop_mutex);
1116-
return (-EINVAL);
1118+
return -EINVAL;
11171119
}
11181120
if (cur_ops->init)
11191121
cur_ops->init(); /* no "goto unwind" prior to this point!!! */
@@ -1164,7 +1166,7 @@ rcu_torture_init(void)
11641166
goto unwind;
11651167
}
11661168
fakewriter_tasks = kzalloc(nfakewriters * sizeof(fakewriter_tasks[0]),
1167-
GFP_KERNEL);
1169+
GFP_KERNEL);
11681170
if (fakewriter_tasks == NULL) {
11691171
VERBOSE_PRINTK_ERRSTRING("out of memory");
11701172
firsterr = -ENOMEM;
@@ -1173,7 +1175,7 @@ rcu_torture_init(void)
11731175
for (i = 0; i < nfakewriters; i++) {
11741176
VERBOSE_PRINTK_STRING("Creating rcu_torture_fakewriter task");
11751177
fakewriter_tasks[i] = kthread_run(rcu_torture_fakewriter, NULL,
1176-
"rcu_torture_fakewriter");
1178+
"rcu_torture_fakewriter");
11771179
if (IS_ERR(fakewriter_tasks[i])) {
11781180
firsterr = PTR_ERR(fakewriter_tasks[i]);
11791181
VERBOSE_PRINTK_ERRSTRING("Failed to create fakewriter");

‎kernel/rcutree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
2626
*
2727
* For detailed explanation of Read-Copy Update mechanism see -
28-
* Documentation/RCU
28+
* Documentation/RCU
2929
*/
3030
#include <linux/types.h>
3131
#include <linux/kernel.h>

‎kernel/rcutree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ struct rcu_data {
142142
*/
143143
struct rcu_head *nxtlist;
144144
struct rcu_head **nxttail[RCU_NEXT_SIZE];
145-
long qlen; /* # of queued callbacks */
145+
long qlen; /* # of queued callbacks */
146146
long blimit; /* Upper limit on a processed batch */
147147

148148
#ifdef CONFIG_NO_HZ

‎kernel/rcutree_plugin.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,8 @@ static void rcu_preempt_check_callbacks(int cpu)
370370
rcu_preempt_qs(cpu);
371371
return;
372372
}
373-
if (per_cpu(rcu_preempt_data, cpu).qs_pending) {
373+
if (per_cpu(rcu_preempt_data, cpu).qs_pending)
374374
t->rcu_read_unlock_special |= RCU_READ_UNLOCK_NEED_QS;
375-
}
376375
}
377376

378377
/*

‎kernel/rcutree_trace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* Papers: http://www.rdrop.com/users/paulmck/RCU
2121
*
2222
* For detailed explanation of Read-Copy Update mechanism see -
23-
* Documentation/RCU
23+
* Documentation/RCU
2424
*
2525
*/
2626
#include <linux/types.h>

0 commit comments

Comments
 (0)