Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 69589
b: refs/heads/master
c: dcca2bd
h: refs/heads/master
i:
  69587: 827c829
v: v3
  • Loading branch information
Will Schmidt authored and Linus Torvalds committed Oct 16, 2007
1 parent b8b4cb2 commit c40b7f1
Show file tree
Hide file tree
Showing 19 changed files with 19 additions and 19 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: 1cd7daa51baf0934882bf24a7ae378ec75df665e
refs/heads/master: dcca2bde4f86a14d3291660bede8f1844fe2b3df
2 changes: 1 addition & 1 deletion trunk/arch/alpha/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
current->comm, current->pid);
if (!user_mode(regs))
goto no_context;
do_exit(SIGKILL);
do_group_exit(SIGKILL);

do_sigbus:
/* Send a sigbus, regardless of whether we were in kernel
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
* the page fault gracefully.
*/
printk("VM: killing process %s\n", tsk->comm);
do_exit(SIGKILL);
do_group_exit(SIGKILL);
return 0;
}
if (fault & VM_FAULT_SIGBUS) {
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/avr32/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs)
}
printk("VM: Killing process %s\n", tsk->comm);
if (user_mode(regs))
do_exit(SIGKILL);
do_group_exit(SIGKILL);
goto no_context;

do_sigbus:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/cris/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
up_read(&mm->mmap_sem);
printk("VM: killing process %s\n", tsk->comm);
if (user_mode(regs))
do_exit(SIGKILL);
do_group_exit(SIGKILL);
goto no_context;

do_sigbus:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/frv/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
up_read(&mm->mmap_sem);
printk("VM: killing process %s\n", current->comm);
if (user_mode(__frame))
do_exit(SIGKILL);
do_group_exit(SIGKILL);
goto no_context;

do_sigbus:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/ia64/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
}
printk(KERN_CRIT "VM: killing process %s\n", current->comm);
if (user_mode(regs))
do_exit(SIGKILL);
do_group_exit(SIGKILL);
goto no_context;
}
2 changes: 1 addition & 1 deletion trunk/arch/m32r/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
}
printk("VM: killing process %s\n", tsk->comm);
if (error_code & ACE_USERMODE)
do_exit(SIGKILL);
do_group_exit(SIGKILL);
goto no_context;

do_sigbus:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/m68k/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,

printk("VM: killing process %s\n", current->comm);
if (user_mode(regs))
do_exit(SIGKILL);
do_group_exit(SIGKILL);

no_context:
current->thread.signo = SIGBUS;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,
}
printk("VM: killing process %s\n", tsk->comm);
if (user_mode(regs))
do_exit(SIGKILL);
do_group_exit(SIGKILL);
goto no_context;

do_sigbus:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/parisc/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,6 @@ void do_page_fault(struct pt_regs *regs, unsigned long code,
up_read(&mm->mmap_sem);
printk(KERN_CRIT "VM: killing process %s\n", current->comm);
if (user_mode(regs))
do_exit(SIGKILL);
do_group_exit(SIGKILL);
goto no_context;
}
2 changes: 1 addition & 1 deletion trunk/arch/ppc/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
}
printk("VM: killing process %s\n", current->comm);
if (user_mode(regs))
do_exit(SIGKILL);
do_group_exit(SIGKILL);
return SIGKILL;

do_sigbus:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/s390/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ static int do_out_of_memory(struct pt_regs *regs, unsigned long error_code,
}
printk("VM: killing process %s\n", tsk->comm);
if (regs->psw.mask & PSW_MASK_PSTATE)
do_exit(SIGKILL);
do_group_exit(SIGKILL);
do_no_context(regs, error_code, address);
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sh/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
}
printk("VM: killing process %s\n", tsk->comm);
if (user_mode(regs))
do_exit(SIGKILL);
do_group_exit(SIGKILL);
goto no_context;

do_sigbus:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sh64/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
}
printk("VM: killing process %s\n", tsk->comm);
if (user_mode(regs))
do_exit(SIGKILL);
do_group_exit(SIGKILL);
goto no_context;

do_sigbus:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sparc/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
up_read(&mm->mmap_sem);
printk("VM: killing process %s\n", tsk->comm);
if (from_user)
do_exit(SIGKILL);
do_group_exit(SIGKILL);
goto no_context;

do_sigbus:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sparc64/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
up_read(&mm->mmap_sem);
printk("VM: killing process %s\n", current->comm);
if (!(regs->tstate & TSTATE_PRIV))
do_exit(SIGKILL);
do_group_exit(SIGKILL);
goto handle_kernel_fault;

intr_or_no_mm:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/mm/fault_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs,
}
printk("VM: killing process %s\n", tsk->comm);
if (error_code & 4)
do_exit(SIGKILL);
do_group_exit(SIGKILL);
goto no_context;

do_sigbus:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/xtensa/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ void do_page_fault(struct pt_regs *regs)
}
printk("VM: killing process %s\n", current->comm);
if (user_mode(regs))
do_exit(SIGKILL);
do_group_exit(SIGKILL);
bad_page_fault(regs, address, SIGKILL);
return;

Expand Down

0 comments on commit c40b7f1

Please sign in to comment.