diff options
Diffstat (limited to 'vserver-sources/2.2.0_rc15/4411_vs2.2.0-rc15-vmpid-feat01.patch')
-rw-r--r-- | vserver-sources/2.2.0_rc15/4411_vs2.2.0-rc15-vmpid-feat01.patch | 197 |
1 files changed, 197 insertions, 0 deletions
diff --git a/vserver-sources/2.2.0_rc15/4411_vs2.2.0-rc15-vmpid-feat01.patch b/vserver-sources/2.2.0_rc15/4411_vs2.2.0-rc15-vmpid-feat01.patch new file mode 100644 index 0000000..8de1ed1 --- /dev/null +++ b/vserver-sources/2.2.0_rc15/4411_vs2.2.0-rc15-vmpid-feat01.patch @@ -0,0 +1,197 @@ +Index: linux-2.6.20/arch/alpha/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/alpha/mm/fault.c ++++ linux-2.6.20/arch/alpha/mm/fault.c +@@ -198,8 +198,8 @@ do_page_fault(unsigned long address, uns + down_read(&mm->mmap_sem); + goto survive; + } +- printk(KERN_ALERT "VM: killing process %s(%d)\n", +- current->comm, current->pid); ++ printk(KERN_ALERT "VM: killing process %s(%d:#%u)\n", ++ current->comm, current->pid, current->xid); + if (!user_mode(regs)) + goto no_context; + do_exit(SIGKILL); +Index: linux-2.6.20/arch/arm/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/arm/mm/fault.c ++++ linux-2.6.20/arch/arm/mm/fault.c +@@ -267,7 +267,8 @@ do_page_fault(unsigned long addr, unsign + * happened to us that made us unable to handle + * the page fault gracefully. + */ +- printk("VM: killing process %s\n", tsk->comm); ++ printk("VM: killing process %s(%d:#%u)\n", ++ tsk->comm, tsk->pid, tsk->xid); + do_exit(SIGKILL); + return 0; + +Index: linux-2.6.20/arch/i386/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/i386/mm/fault.c ++++ linux-2.6.20/arch/i386/mm/fault.c +@@ -594,7 +594,8 @@ out_of_memory: + down_read(&mm->mmap_sem); + goto survive; + } +- printk("VM: killing process %s\n", tsk->comm); ++ printk("VM: killing process %s(%d:#%u)\n", ++ tsk->comm, tsk->pid, tsk->xid); + if (error_code & 4) + do_exit(SIGKILL); + goto no_context; +Index: linux-2.6.20/arch/mips/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/mips/mm/fault.c ++++ linux-2.6.20/arch/mips/mm/fault.c +@@ -180,7 +180,8 @@ out_of_memory: + down_read(&mm->mmap_sem); + goto survive; + } +- printk("VM: killing process %s\n", tsk->comm); ++ printk("VM: killing process %s(%d:#%u)\n", ++ tsk->comm, tsk->pid, tsk->xid); + if (user_mode(regs)) + do_exit(SIGKILL); + goto no_context; +Index: linux-2.6.20/arch/parisc/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/parisc/mm/fault.c ++++ linux-2.6.20/arch/parisc/mm/fault.c +@@ -265,7 +265,8 @@ no_context: + + out_of_memory: + up_read(&mm->mmap_sem); +- printk(KERN_CRIT "VM: killing process %s\n", current->comm); ++ printk(KERN_CRIT "VM: killing process %s(%d:#%u)\n", ++ current->comm, current->pid, current->xid); + if (user_mode(regs)) + do_exit(SIGKILL); + goto no_context; +Index: linux-2.6.20/arch/powerpc/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/powerpc/mm/fault.c ++++ linux-2.6.20/arch/powerpc/mm/fault.c +@@ -391,7 +391,8 @@ out_of_memory: + down_read(&mm->mmap_sem); + goto survive; + } +- printk("VM: killing process %s\n", current->comm); ++ printk("VM: killing process %s(%d:#%u)\n", ++ current->comm, current->pid, current->xid); + if (user_mode(regs)) + do_exit(SIGKILL); + return SIGKILL; +Index: linux-2.6.20/arch/ppc/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/ppc/mm/fault.c ++++ linux-2.6.20/arch/ppc/mm/fault.c +@@ -296,7 +296,8 @@ out_of_memory: + down_read(&mm->mmap_sem); + goto survive; + } +- printk("VM: killing process %s\n", current->comm); ++ printk("VM: killing process %s(%d:#%u)\n", ++ current->comm, current->pid, current->xid); + if (user_mode(regs)) + do_exit(SIGKILL); + return SIGKILL; +Index: linux-2.6.20/arch/s390/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/s390/mm/fault.c ++++ linux-2.6.20/arch/s390/mm/fault.c +@@ -359,7 +359,8 @@ out_of_memory: + down_read(&mm->mmap_sem); + goto survive; + } +- printk("VM: killing process %s\n", tsk->comm); ++ printk("VM: killing process %s(%d:#%u)\n", ++ tsk->comm, tsk->pid, tsk->xid); + if (regs->psw.mask & PSW_MASK_PSTATE) + do_exit(SIGKILL); + goto no_context; +Index: linux-2.6.20/arch/sh/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/sh/mm/fault.c ++++ linux-2.6.20/arch/sh/mm/fault.c +@@ -202,7 +202,8 @@ out_of_memory: + down_read(&mm->mmap_sem); + goto survive; + } +- printk("VM: killing process %s\n", tsk->comm); ++ printk("VM: killing process %s(%d:#%u)\n", ++ tsk->comm, tsk->pid, tsk->xid); + if (user_mode(regs)) + do_exit(SIGKILL); + goto no_context; +Index: linux-2.6.20/arch/sh64/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/sh64/mm/fault.c ++++ linux-2.6.20/arch/sh64/mm/fault.c +@@ -331,7 +331,8 @@ out_of_memory: + down_read(&mm->mmap_sem); + goto survive; + } +- printk("VM: killing process %s\n", tsk->comm); ++ printk("VM: killing process %s(%d:#%u)\n", ++ tsk->comm, tsk->pid, tsk->xid); + if (user_mode(regs)) + do_exit(SIGKILL); + goto no_context; +Index: linux-2.6.20/arch/sparc/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/sparc/mm/fault.c ++++ linux-2.6.20/arch/sparc/mm/fault.c +@@ -368,7 +368,8 @@ no_context: + */ + out_of_memory: + up_read(&mm->mmap_sem); +- printk("VM: killing process %s\n", tsk->comm); ++ printk("VM: killing process %s(%d:#%u)\n", ++ tsk->comm, tsk->pid, tsk->xid); + if (from_user) + do_exit(SIGKILL); + goto no_context; +Index: linux-2.6.20/arch/sparc64/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/sparc64/mm/fault.c ++++ linux-2.6.20/arch/sparc64/mm/fault.c +@@ -484,7 +484,8 @@ handle_kernel_fault: + out_of_memory: + insn = get_fault_insn(regs, insn); + up_read(&mm->mmap_sem); +- printk("VM: killing process %s\n", current->comm); ++ printk("VM: killing process %s(%d:#%u)\n", ++ current->comm, current->pid, current->xid); + if (!(regs->tstate & TSTATE_PRIV)) + do_exit(SIGKILL); + goto handle_kernel_fault; +Index: linux-2.6.20/arch/um/kernel/trap.c +=================================================================== +--- linux-2.6.20.orig/arch/um/kernel/trap.c ++++ linux-2.6.20/arch/um/kernel/trap.c +@@ -193,7 +193,8 @@ unsigned long segv(struct faultinfo fi, + current->thread.arch.faultinfo = fi; + force_sig_info(SIGBUS, &si, current); + } else if (err == -ENOMEM) { +- printk("VM: killing process %s\n", current->comm); ++ printk("VM: killing process %s(%d:#%u)\n", ++ current->comm, current->pid, current->xid); + do_exit(SIGKILL); + } else { + BUG_ON(err != -EFAULT); +Index: linux-2.6.20/arch/x86_64/mm/fault.c +=================================================================== +--- linux-2.6.20.orig/arch/x86_64/mm/fault.c ++++ linux-2.6.20/arch/x86_64/mm/fault.c +@@ -584,7 +584,8 @@ out_of_memory: + yield(); + goto again; + } +- printk("VM: killing process %s\n", tsk->comm); ++ printk("VM: killing process %s(%d:#%u)\n", ++ tsk->comm, tsk->pid, tsk->xid); + if (error_code & 4) + do_exit(SIGKILL); + goto no_context; |