ARM: convert /proc/cpu/aligment to seq_file

[safe/jmp/linux-2.6] / arch / alpha / mm / fault.c

diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
index e0593e6..00a31de 100644 (file)
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
@@ -146,7 +146,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
        /* If for any reason at all we couldn't handle the fault,
           make sure we exit gracefully rather than endlessly redo
           the fault.  */
-       fault = handle_mm_fault(mm, vma, address, cause > 0);
+       fault = handle_mm_fault(mm, vma, address, cause > 0 ? FAULT_FLAG_WRITE : 0);
        up_read(&mm->mmap_sem);
        if (unlikely(fault & VM_FAULT_ERROR)) {
                if (fault & VM_FAULT_OOM)
@@ -194,7 +194,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
                goto survive;
        }
        printk(KERN_ALERT "VM: killing process %s(%d)\n",
-              current->comm, current->pid);
+              current->comm, task_pid_nr(current));
        if (!user_mode(regs))
                goto no_context;
        do_group_exit(SIGKILL);