Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit a71fca58b7f4abca551ae2256ac08dd9123a03f9

Authored by Paul E. McKenney
Committed by Ingo Molnar
1 parent 49e291266d
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 9 changed files with 26 additions and 25 deletions Side-by-side Diff

include/linux/rculist_nulls.h
Diff comments   View file @ a71fca5
... ... @@ -102,7 +102,7 @@
102 102 */
103 103 #define hlist_nulls_for_each_entry_rcu(tpos, pos, head, member) \
104 104 for (pos = rcu_dereference((head)->first); \
105   - (!is_a_nulls(pos)) && \
  105 + (!is_a_nulls(pos)) && \
106 106 ({ tpos = hlist_nulls_entry(pos, typeof(*tpos), member); 1; }); \
107 107 pos = rcu_dereference(pos->next))
108 108  
include/linux/rcupdate.h
Diff comments   View file @ a71fca5
1 1 /*
2   - * Read-Copy Update mechanism for mutual exclusion
  2 + * Read-Copy Update mechanism for mutual exclusion
3 3 *
4 4 * This program is free software; you can redistribute it and/or modify
5 5 * it under the terms of the GNU General Public License as published by
... ... @@ -18,7 +18,7 @@
18 18 * Copyright IBM Corporation, 2001
19 19 *
20 20 * Author: Dipankar Sarma <dipankar@in.ibm.com>
21   - *
  21 + *
22 22 * Based on the original work by Paul McKenney <paulmck@us.ibm.com>
23 23 * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
24 24 * Papers:
... ... @@ -26,7 +26,7 @@
26 26 * http://lse.sourceforge.net/locking/rclock_OLS.2001.05.01c.sc.pdf (OLS2001)
27 27 *
28 28 * 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
30 30 *
31 31 */
32 32  
include/linux/rcutree.h
Diff comments   View file @ a71fca5
... ... @@ -24,7 +24,7 @@
24 24 * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
25 25 *
26 26 * For detailed explanation of Read-Copy Update mechanism see -
27   - * Documentation/RCU
  27 + * Documentation/RCU
28 28 */
29 29  
30 30 #ifndef __LINUX_RCUTREE_H
... ... @@ -19,7 +19,7 @@
19 19 *
20 20 * Authors: Dipankar Sarma <dipankar@in.ibm.com>
21 21 * Manfred Spraul <manfred@colorfullife.com>
22   - *
  22 + *
23 23 * Based on the original work by Paul McKenney <paulmck@us.ibm.com>
24 24 * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
25 25 * Papers:
... ... @@ -27,7 +27,7 @@
27 27 * http://lse.sourceforge.net/locking/rclock_OLS.2001.05.01c.sc.pdf (OLS2001)
28 28 *
29 29 * 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
31 31 *
32 32 */
33 33 #include <linux/types.h>
... ... @@ -18,7 +18,7 @@
18 18 * Copyright (C) IBM Corporation, 2005, 2006
19 19 *
20 20 * Authors: Paul E. McKenney <paulmck@us.ibm.com>
21   - * Josh Triplett <josh@freedesktop.org>
  21 + * Josh Triplett <josh@freedesktop.org>
22 22 *
23 23 * See also: Documentation/RCU/torture.txt
24 24 */
... ... @@ -50,7 +50,7 @@
50 50  
51 51 MODULE_LICENSE("GPL");
52 52 MODULE_AUTHOR("Paul E. McKenney <paulmck@us.ibm.com> and "
53   - "Josh Triplett <josh@freedesktop.org>");
  53 + "Josh Triplett <josh@freedesktop.org>");
54 54  
55 55 static int nreaders = -1; /* # reader threads, defaults to 2*ncpus */
56 56 static int nfakewriters = 4; /* # fake writer threads */
... ... @@ -110,8 +110,8 @@
110 110 };
111 111  
112 112 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;
115 115 static struct rcu_torture rcu_tortures[10 * RCU_TORTURE_PIPE_LEN];
116 116 static DEFINE_SPINLOCK(rcu_torture_lock);
117 117 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
118 118  
... ... @@ -124,11 +124,11 @@
124 124 static atomic_t n_rcu_torture_free;
125 125 static atomic_t n_rcu_torture_mberror;
126 126 static atomic_t n_rcu_torture_error;
127   -static long n_rcu_torture_timers = 0;
  127 +static long n_rcu_torture_timers;
128 128 static struct list_head rcu_torture_removed;
129 129 static cpumask_var_t shuffle_tmp_mask;
130 130  
131   -static int stutter_pause_test = 0;
  131 +static int stutter_pause_test;
132 132  
133 133 #if defined(MODULE) || defined(CONFIG_RCU_TORTURE_TEST_RUNNABLE)
134 134 #define RCUTORTURE_RUNNABLE_INIT 1
135 135  
... ... @@ -267,8 +267,9 @@
267 267 int irq_capable;
268 268 char *name;
269 269 };
270   -static struct rcu_torture_ops *cur_ops = NULL;
271 270  
  271 +static struct rcu_torture_ops *cur_ops;
  272 +
272 273 /*
273 274 * Definitions for rcu torture testing.
274 275 */
... ... @@ -342,8 +343,8 @@
342 343 .sync = synchronize_rcu,
343 344 .cb_barrier = rcu_barrier,
344 345 .stats = NULL,
345   - .irq_capable = 1,
346   - .name = "rcu"
  346 + .irq_capable = 1,
  347 + .name = "rcu"
347 348 };
348 349  
349 350 static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
... ... @@ -641,7 +642,8 @@
641 642  
642 643 do {
643 644 schedule_timeout_uninterruptible(1);
644   - if ((rp = rcu_torture_alloc()) == NULL)
  645 + rp = rcu_torture_alloc();
  646 + if (rp == NULL)
645 647 continue;
646 648 rp->rtort_pipe_count = 0;
647 649 udelay(rcu_random(&rand) & 0x3ff);
... ... @@ -1113,7 +1115,7 @@
1113 1115 printk(KERN_ALERT "rcutorture: invalid torture type: \"%s\"\n",
1114 1116 torture_type);
1115 1117 mutex_unlock(&fullstop_mutex);
1116   - return (-EINVAL);
  1118 + return -EINVAL;
1117 1119 }
1118 1120 if (cur_ops->init)
1119 1121 cur_ops->init(); /* no "goto unwind" prior to this point!!! */
... ... @@ -1164,7 +1166,7 @@
1164 1166 goto unwind;
1165 1167 }
1166 1168 fakewriter_tasks = kzalloc(nfakewriters * sizeof(fakewriter_tasks[0]),
1167   - GFP_KERNEL);
  1169 + GFP_KERNEL);
1168 1170 if (fakewriter_tasks == NULL) {
1169 1171 VERBOSE_PRINTK_ERRSTRING("out of memory");
1170 1172 firsterr = -ENOMEM;
... ... @@ -1173,7 +1175,7 @@
1173 1175 for (i = 0; i < nfakewriters; i++) {
1174 1176 VERBOSE_PRINTK_STRING("Creating rcu_torture_fakewriter task");
1175 1177 fakewriter_tasks[i] = kthread_run(rcu_torture_fakewriter, NULL,
1176   - "rcu_torture_fakewriter");
  1178 + "rcu_torture_fakewriter");
1177 1179 if (IS_ERR(fakewriter_tasks[i])) {
1178 1180 firsterr = PTR_ERR(fakewriter_tasks[i]);
1179 1181 VERBOSE_PRINTK_ERRSTRING("Failed to create fakewriter");
... ... @@ -25,7 +25,7 @@
25 25 * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
26 26 *
27 27 * For detailed explanation of Read-Copy Update mechanism see -
28   - * Documentation/RCU
  28 + * Documentation/RCU
29 29 */
30 30 #include <linux/types.h>
31 31 #include <linux/kernel.h>
... ... @@ -142,7 +142,7 @@
142 142 */
143 143 struct rcu_head *nxtlist;
144 144 struct rcu_head **nxttail[RCU_NEXT_SIZE];
145   - long qlen; /* # of queued callbacks */
  145 + long qlen; /* # of queued callbacks */
146 146 long blimit; /* Upper limit on a processed batch */
147 147  
148 148 #ifdef CONFIG_NO_HZ
kernel/rcutree_plugin.h
Diff comments   View file @ a71fca5
... ... @@ -370,9 +370,8 @@
370 370 rcu_preempt_qs(cpu);
371 371 return;
372 372 }
373   - if (per_cpu(rcu_preempt_data, cpu).qs_pending) {
  373 + if (per_cpu(rcu_preempt_data, cpu).qs_pending)
374 374 t->rcu_read_unlock_special |= RCU_READ_UNLOCK_NEED_QS;
375   - }
376 375 }
377 376  
378 377 /*
kernel/rcutree_trace.c
Diff comments   View file @ a71fca5
... ... @@ -20,7 +20,7 @@
20 20 * Papers: http://www.rdrop.com/users/paulmck/RCU
21 21 *
22 22 * For detailed explanation of Read-Copy Update mechanism see -
23   - * Documentation/RCU
  23 + * Documentation/RCU
24 24 *
25 25 */
26 26 #include <linux/types.h>