patch-2.4.20 linux-2.4.20/arch/alpha/mm/fault.c
Next file: linux-2.4.20/arch/arm/config.in
Previous file: linux-2.4.20/arch/alpha/lib/stxncpy.S
Back to the patch index
Back to the overall index
- Lines: 100
- Date:
Thu Nov 28 15:53:08 2002
- Orig file:
linux-2.4.19/arch/alpha/mm/fault.c
- Orig date:
Mon Sep 17 16:15:02 2001
diff -urN linux-2.4.19/arch/alpha/mm/fault.c linux-2.4.20/arch/alpha/mm/fault.c
@@ -88,6 +88,7 @@
struct mm_struct *mm = current->mm;
unsigned int fixup;
int fault;
+ siginfo_t info;
/* As of EV6, a load into $31/$f31 is a prefetch, and never faults
(or is suppressed by the PALcode). Support that for older CPUs
@@ -108,6 +109,8 @@
if (!mm || in_interrupt())
goto no_context;
+ info.si_code = SEGV_MAPERR;
+
#ifdef CONFIG_ALPHA_LARGE_VMALLOC
if (address >= TASK_SIZE)
goto vmalloc_fault;
@@ -128,6 +131,7 @@
* we can handle it..
*/
good_area:
+ info.si_code = SEGV_ACCERR;
if (cause < 0) {
if (!(vma->vm_flags & VM_EXEC))
goto bad_area;
@@ -147,13 +151,12 @@
* the fault.
*/
fault = handle_mm_fault(mm, vma, address, cause > 0);
- up_read(&mm->mmap_sem);
-
if (fault < 0)
goto out_of_memory;
if (fault == 0)
goto do_sigbus;
+ up_read(&mm->mmap_sem);
return;
/*
@@ -164,7 +167,12 @@
up_read(&mm->mmap_sem);
if (user_mode(regs)) {
- force_sig(SIGSEGV, current);
+
+ info.si_signo = SIGSEGV;
+ info.si_errno = 0;
+ /* info.si_code has been set above */
+ info.si_addr = (void *)address;
+ force_sig_info(SIGSEGV,&info,current);
return;
}
@@ -196,11 +204,10 @@
*/
out_of_memory:
if (current->pid == 1) {
- current->policy |= SCHED_YIELD;
- schedule();
- down_read(&mm->mmap_sem);
+ yield();
goto survive;
}
+ up_read(&mm->mmap_sem);
printk(KERN_ALERT "VM: killing process %s(%d)\n",
current->comm, current->pid);
if (!user_mode(regs))
@@ -208,11 +215,17 @@
do_exit(SIGKILL);
do_sigbus:
+ up_read(&mm->mmap_sem);
/*
* Send a sigbus, regardless of whether we were in kernel
* or user mode.
*/
- force_sig(SIGBUS, current);
+ info.si_signo = SIGBUS;
+ info.si_errno = 0;
+ /* not sure si_code value here */
+ info.si_code = BUS_ADRERR;
+ info.si_addr = (void *)address;
+ force_sig_info(SIGBUS,&info,current);
if (!user_mode(regs))
goto no_context;
return;
@@ -220,7 +233,11 @@
#ifdef CONFIG_ALPHA_LARGE_VMALLOC
vmalloc_fault:
if (user_mode(regs)) {
- force_sig(SIGSEGV, current);
+ info.si_signo = SIGSEGV;
+ info.si_errno = 0;
+ /* info.si_code has been set above */
+ info.si_addr = (void *)address;
+ force_sig_info(SIGSEGV,&info,current);
return;
} else {
/* Synchronize this task's top level page-table
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)