Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caa007dd authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Ingo Molnar
Browse files

x86: coding style fixes to arch/x86/kernel/signal_64.c 



Fix all errors and many warnings reported by checkpatch.pl
without change signal_64.o

arch/x86/kernel/signal_64.o
text    data     bss     dec     hex filename
5143       0       8    5151    141f signal_64.o.after
5143       0       8    5151    141f signal_64.o.before
md5:
e68718092b3641cb27e79e55ce57e3ad  signal_64.o.after
e68718092b3641cb27e79e55ce57e3ad  signal_64.o.before

Signed-off-by: default avatarGustavo F. Padovan <gustavo@las.ic.unicamp.br>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 08aadf06

arch/x86/kernel/sigframe.h

+5 −0
Original line number Diff line number Diff line
@@ -24,4 +24,9 @@ struct rt_sigframe { 
	struct ucontext uc;

	struct siginfo info;

};



int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,

		sigset_t *set, struct pt_regs *regs);

int ia32_setup_frame(int sig, struct k_sigaction *ka,

		sigset_t *set, struct pt_regs *regs);

#endif

arch/x86/kernel/signal_64.c

+30 −32
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ 
#include <linux/stddef.h>

#include <linux/personality.h>

#include <linux/compiler.h>

#include <linux/uaccess.h>



#include <asm/processor.h>

#include <asm/ucontext.h>

#include <asm/uaccess.h>

#include <asm/i387.h>

#include <asm/proto.h>

#include <asm/ia32_unistd.h>
@@ -41,11 +42,6 @@ 
# define FIX_EFLAGS	__FIX_EFLAGS

#endif



int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,

               sigset_t *set, struct pt_regs * regs); 

int ia32_setup_frame(int sig, struct k_sigaction *ka,

            sigset_t *set, struct pt_regs * regs); 



asmlinkage long

sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,

		struct pt_regs *regs)
@@ -119,7 +115,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, 
	/* Always make any pending restarted system calls return -EINTR */

	current_thread_info()->restart_block.fn = do_no_restart_syscall;



#define COPY(x)		err |= __get_user(regs->x, &sc->x)

#define COPY(x)		(err |= __get_user(regs->x, &sc->x))



	COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);

	COPY(dx); COPY(cx); COPY(ip);
@@ -208,7 +204,8 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) 
 */



static inline int

setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, unsigned long mask, struct task_struct *me)

setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,

		unsigned long mask, struct task_struct *me)

{

	int err = 0;
@@ -556,7 +553,8 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where) 
	struct task_struct *me = current;

	if (show_unhandled_signals && printk_ratelimit()) {

		printk("%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx",

	       me->comm,me->pid,where,frame,regs->ip,regs->sp,regs->orig_ax);

	       me->comm, me->pid, where, frame, regs->ip,

		   regs->sp, regs->orig_ax);

		print_vma_addr(" in ", regs->ip);

		printk("\n");

	}