Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88414
b: refs/heads/master
c: c2e8b85
h: refs/heads/master
v: v3
  • Loading branch information
Heiko Carstens committed Apr 17, 2008
1 parent abbd187 commit 5336d04
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a695f16729e00995fe72baf0e8bee4bf9c232ae0
refs/heads/master: c2e8b8531b162fb314434f1f2608ba1ddf46b98f
16 changes: 8 additions & 8 deletions trunk/arch/s390/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ static void do_sigbus(struct pt_regs *regs, unsigned long error_code,
}

#ifdef CONFIG_S390_EXEC_PROTECT
extern long sys_sigreturn(struct pt_regs *regs);
extern long sys_rt_sigreturn(struct pt_regs *regs);
extern long sys32_sigreturn(struct pt_regs *regs);
extern long sys32_rt_sigreturn(struct pt_regs *regs);
extern long sys_sigreturn(void);
extern long sys_rt_sigreturn(void);
extern long sys32_sigreturn(void);
extern long sys32_rt_sigreturn(void);

static int signal_return(struct mm_struct *mm, struct pt_regs *regs,
unsigned long address, unsigned long error_code)
Expand All @@ -270,15 +270,15 @@ static int signal_return(struct mm_struct *mm, struct pt_regs *regs,
#ifdef CONFIG_COMPAT
compat = test_tsk_thread_flag(current, TIF_31BIT);
if (compat && instruction == 0x0a77)
sys32_sigreturn(regs);
sys32_sigreturn();
else if (compat && instruction == 0x0aad)
sys32_rt_sigreturn(regs);
sys32_rt_sigreturn();
else
#endif
if (instruction == 0x0a77)
sys_sigreturn(regs);
sys_sigreturn();
else if (instruction == 0x0aad)
sys_rt_sigreturn(regs);
sys_rt_sigreturn();
else {
current->thread.prot_addr = address;
current->thread.trap_no = error_code;
Expand Down

0 comments on commit 5336d04

Please sign in to comment.