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

Commit 1c3d99c1 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Andi Kleen
Browse files

[PATCH] x86-64: Fix x86_64 compilation with DEBUG_SIG on 



Setting the DEBUG_SIG flag breaks compilation due to a wrong
struct access. Aditionally, it raises two warnings. This is one
patch to fix them all.

Signed-off-by: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent b7fb4af0

arch/x86_64/kernel/signal.c

+3 −3
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) 
		goto badframe;



#ifdef DEBUG_SIG

	printk("%d sigreturn rip:%lx rsp:%lx frame:%p rax:%lx\n",current->pid,regs.rip,regs.rsp,frame,eax);

	printk("%d sigreturn rip:%lx rsp:%lx frame:%p rax:%lx\n",current->pid,regs->rip,regs->rsp,frame,eax);

#endif



	if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->rsp) == -EFAULT)
@@ -301,7 +301,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
	if (test_thread_flag(TIF_SINGLESTEP))

		ptrace_notify(SIGTRAP);

#ifdef DEBUG_SIG

	printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n",

	printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%p\n",

		current->comm, current->pid, frame, regs->rip, frame->pretcode);

#endif
@@ -463,7 +463,7 @@ void 
do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)

{

#ifdef DEBUG_SIG

	printk("do_notify_resume flags:%x rip:%lx rsp:%lx caller:%lx pending:%lx\n",

	printk("do_notify_resume flags:%x rip:%lx rsp:%lx caller:%p pending:%x\n",

	       thread_info_flags, regs->rip, regs->rsp, __builtin_return_address(0),signal_pending(current)); 

#endif