diff --git a/[refs] b/[refs] index 73c5ebab7a8e..7ade3273b56d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fb7c6e4cba35b5e7cef88b58d0a2ad164d801a5 +refs/heads/master: f5264481c8049673e2cc8c7aca410931f571ba2d diff --git a/trunk/fs/select.c b/trunk/fs/select.c index 5633fe980781..00f58c5c7e05 100644 --- a/trunk/fs/select.c +++ b/trunk/fs/select.c @@ -260,7 +260,7 @@ int do_select(int n, fd_set_bits *fds, s64 *timeout) wait = NULL; if (retval || !*timeout || signal_pending(current)) break; - if(table.error) { + if (table.error) { retval = table.error; break; } diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index cc8303cd093d..64ad0ed15992 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -220,7 +220,7 @@ void flush_signals(struct task_struct *t) unsigned long flags; spin_lock_irqsave(&t->sighand->siglock, flags); - clear_tsk_thread_flag(t,TIF_SIGPENDING); + clear_tsk_thread_flag(t, TIF_SIGPENDING); flush_sigqueue(&t->pending); flush_sigqueue(&t->signal->shared_pending); spin_unlock_irqrestore(&t->sighand->siglock, flags); @@ -424,7 +424,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info) } if (signr && ((info->si_code & __SI_MASK) == __SI_TIMER) && - info->si_sys_private){ + info->si_sys_private) { /* * Release the siglock to ensure proper locking order * of timer locks outside of siglocks. Note, we leave diff --git a/trunk/kernel/stop_machine.c b/trunk/kernel/stop_machine.c index 6f4e0e13f70c..316283cb60cb 100644 --- a/trunk/kernel/stop_machine.c +++ b/trunk/kernel/stop_machine.c @@ -135,8 +135,7 @@ static void restart_machine(void) preempt_enable_no_resched(); } -struct stop_machine_data -{ +struct stop_machine_data { int (*fn)(void *); void *data; struct completion done; diff --git a/trunk/mm/pdflush.c b/trunk/mm/pdflush.c index 8f6ee073c0e3..3931f716454a 100644 --- a/trunk/mm/pdflush.c +++ b/trunk/mm/pdflush.c @@ -17,8 +17,8 @@ #include #include #include -#include // Needed by writeback.h -#include // Prototypes pdflush_operation() +#include /* Needed by writeback.h */ +#include /* Prototypes pdflush_operation() */ #include #include #include