[UNNECESSARY PATCH 12/16] signal: 80 column wrapping

From: Joe Perches
Date: Sun Nov 16 2014 - 15:11:22 EST


Just neaten some lines that extend beyond 80 columns.

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
kernel/signal.c | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/kernel/signal.c b/kernel/signal.c
index 1946fa1..15ce05d 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -983,7 +983,8 @@ static void complete_signal(int sig, struct task_struct *p, int group)
signal->group_stop_count = 0;
t = p;
do {
- task_clear_jobctl_pending(t, JOBCTL_PENDING_MASK);
+ task_clear_jobctl_pending(t,
+ JOBCTL_PENDING_MASK);
sigaddset(&t->pending.signal, SIGKILL);
signal_wake_up(t, 1);
} while_each_thread(p, t);
@@ -1079,7 +1080,8 @@ static int __send_signal(int sig, struct siginfo *info, struct task_struct *t,
q->info.si_code = SI_USER;
q->info.si_pid = task_tgid_nr_ns(current,
task_active_pid_ns(t));
- q->info.si_uid = from_kuid_munged(current_user_ns(), current_uid());
+ q->info.si_uid = from_kuid_munged(current_user_ns(),
+ current_uid());
break;
case (unsigned long)SEND_SIG_PRIV:
q->info.si_signo = sig;
@@ -1375,8 +1377,10 @@ static int kill_as_cred_perm(const struct cred *cred,
{
const struct cred *pcred = __task_cred(target);

- if (!uid_eq(cred->euid, pcred->suid) && !uid_eq(cred->euid, pcred->uid) &&
- !uid_eq(cred->uid, pcred->suid) && !uid_eq(cred->uid, pcred->uid))
+ if (!uid_eq(cred->euid, pcred->suid) &&
+ !uid_eq(cred->euid, pcred->uid) &&
+ !uid_eq(cred->uid, pcred->suid) &&
+ !uid_eq(cred->uid, pcred->uid))
return 0;
return 1;
}
@@ -1752,7 +1756,8 @@ static void do_notify_parent_cldstop(struct task_struct *tsk,
*/
rcu_read_lock();
info.si_pid = task_pid_nr_ns(tsk, task_active_pid_ns(parent));
- info.si_uid = from_kuid_munged(task_cred_xxx(parent, user_ns), task_uid(tsk));
+ info.si_uid = from_kuid_munged(task_cred_xxx(parent, user_ns),
+ task_uid(tsk));
rcu_read_unlock();

task_cputime(tsk, &utime, &stime);
@@ -1816,8 +1821,8 @@ static inline int may_ptrace_stop(void)
*/
static int sigkill_pending(struct task_struct *tsk)
{
- return sigismember(&tsk->pending.signal, SIGKILL) ||
- sigismember(&tsk->signal->shared_pending.signal, SIGKILL);
+ return sigismember(&tsk->pending.signal, SIGKILL) ||
+ sigismember(&tsk->signal->shared_pending.signal, SIGKILL);
}

/*
@@ -2764,7 +2769,8 @@ int copy_siginfo_to_user(siginfo_t __user *to, const siginfo_t *from)
* Other callers might not initialize the si_lsb field,
* so check explicitly for the right codes here.
*/
- if (from->si_code == BUS_MCEERR_AR || from->si_code == BUS_MCEERR_AO)
+ if (from->si_code == BUS_MCEERR_AR ||
+ from->si_code == BUS_MCEERR_AO)
err |= __put_user(from->si_addr_lsb, &to->si_addr_lsb);
#endif
break;
@@ -3201,7 +3207,9 @@ static int do_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
* way that worked) - this fix preserves that older
* mechanism.
*/
- if (ss_flags != SS_DISABLE && ss_flags != SS_ONSTACK && ss_flags != 0)
+ if (ss_flags != SS_DISABLE &&
+ ss_flags != SS_ONSTACK &&
+ ss_flags != 0)
goto out;

if (ss_flags == SS_DISABLE) {
@@ -3280,7 +3288,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
compat_user_stack_pointer());
set_fs(seg);
if (ret >= 0 && uoss_ptr) {
- if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(compat_stack_t)) ||
+ if (!access_ok(VERIFY_WRITE, uoss_ptr,
+ sizeof(compat_stack_t)) ||
__put_user(ptr_to_compat(uoss.ss_sp), &uoss_ptr->ss_sp) ||
__put_user(uoss.ss_flags, &uoss_ptr->ss_flags) ||
__put_user(uoss.ss_size, &uoss_ptr->ss_size))
@@ -3300,9 +3309,10 @@ int __compat_save_altstack(compat_stack_t __user *uss, unsigned long sp)
{
struct task_struct *t = current;

- return __put_user(ptr_to_compat((void __user *)t->sas_ss_sp), &uss->ss_sp) |
- __put_user(sas_ss_flags(sp), &uss->ss_flags) |
- __put_user(t->sas_ss_size, &uss->ss_size);
+ return __put_user(ptr_to_compat((void __user *)t->sas_ss_sp),
+ &uss->ss_sp) |
+ __put_user(sas_ss_flags(sp), &uss->ss_flags) |
+ __put_user(t->sas_ss_size, &uss->ss_size);
}
#endif

--
2.1.2

--
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/