[PATCH 3/3] kernel/hrtimer.c: fix array declarations

From: Fabian Frederick
Date: Fri May 16 2014 - 12:06:37 EST


...and lines over 80 cols

Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
---
kernel/hrtimer.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 1eccb98..d2daf63 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -64,12 +64,10 @@
* to reach a base using a clockid, hrtimer_clockid_to_base()
* is used to convert from clockid to the proper hrtimer_base_type.
*/
-DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) =
-{
+DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) = {

.lock = __RAW_SPIN_LOCK_UNLOCKED(hrtimer_bases.lock),
- .clock_base =
- {
+ .clock_base = {
{
.index = HRTIMER_BASE_MONOTONIC,
.clockid = CLOCK_MONOTONIC,
@@ -164,7 +162,8 @@ struct hrtimer_clock_base *lock_hrtimer_base(const struct hrtimer *timer,
if (likely(base == timer->base))
return base;
/* The timer has migrated to another CPU: */
- raw_spin_unlock_irqrestore(&base->cpu_base->lock, *flags);
+ raw_spin_unlock_irqrestore(&base->cpu_base->lock,
+ *flags);
}
cpu_relax();
}
@@ -1543,7 +1542,8 @@ void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task)
}
EXPORT_SYMBOL_GPL(hrtimer_init_sleeper);

-static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode)
+static int
+__sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode)
{
hrtimer_init_sleeper(t, current);

--
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/