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

Commit 9902a702 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar
Browse files

x86: make X86_32 pt_regs members unsigned long 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 92bc2056

arch/x86/kernel/signal_32.c

+2 −2
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
	int ret;



	/* Are we from a system call? */

	if (regs->orig_ax >= 0) {

	if ((long)regs->orig_ax >= 0) {

		/* If so, check system call restarting.. */

		switch (regs->ax) {

		        case -ERESTART_RESTARTBLOCK:
@@ -625,7 +625,7 @@ static void do_signal(struct pt_regs *regs) 
	}



	/* Did we come from a system call? */

	if (regs->orig_ax >= 0) {

	if ((long)regs->orig_ax >= 0) {

		/* Restart the system call - no handlers present */

		switch (regs->ax) {

		case -ERESTARTNOHAND:

include/asm-x86/ptrace.h

+6 −3
Original line number Diff line number Diff line
@@ -42,12 +42,12 @@ struct pt_regs { 
	unsigned long si;

	unsigned long di;

	unsigned long bp;

	long ax;

	unsigned long ax;

	unsigned long ds;

	unsigned long es;

	unsigned long fs;

	/* int  gs; */

	long orig_ax;

	unsigned long orig_ax;

	unsigned long ip;

	unsigned long cs;

	unsigned long flags;
@@ -145,7 +145,10 @@ extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int erro 
void signal_fault(struct pt_regs *regs, void __user *frame, char *where);

#endif



#define regs_return_value(regs) ((regs)->ax)

static inline unsigned long regs_return_value(struct pt_regs *regs)

{

	return regs->ax;

}



/*

 * user_mode_vm(regs) determines whether a register set came from user mode.