git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
mm
/
fault.c
diff --git
a/arch/ppc/mm/fault.c
b/arch/ppc/mm/fault.c
index
8e08ca3
..
8ad72e0
100644
(file)
--- a/
arch/ppc/mm/fault.c
+++ b/
arch/ppc/mm/fault.c
@@
-13,7
+13,6
@@
* 2 of the License, or (at your option) any later version.
*/
* 2 of the License, or (at your option) any later version.
*/
-#include <linux/config.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/kernel.h>
@@
-240,7
+239,7
@@
good_area:
/* protection fault */
if (error_code & 0x08000000)
goto bad_area;
/* protection fault */
if (error_code & 0x08000000)
goto bad_area;
- if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
+ if (!(vma->vm_flags & (VM_READ | VM_EXEC
| VM_WRITE
)))
goto bad_area;
}
goto bad_area;
}
@@
-292,12
+291,13
@@
bad_area:
*/
out_of_memory:
up_read(&mm->mmap_sem);
*/
out_of_memory:
up_read(&mm->mmap_sem);
- if (
current->pid == 1
) {
+ if (
is_init(current)
) {
yield();
down_read(&mm->mmap_sem);
goto survive;
}
yield();
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;
if (user_mode(regs))
do_exit(SIGKILL);
return SIGKILL;