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
/
sh64
/
mm
/
fault.c
diff --git
a/arch/sh64/mm/fault.c
b/arch/sh64/mm/fault.c
index
f08d0ea
..
e3e90bf
100644
(file)
--- a/
arch/sh64/mm/fault.c
+++ b/
arch/sh64/mm/fault.c
@@
-82,7
+82,7
@@
static inline void print_vma(struct vm_area_struct *vma)
static inline void print_task(struct task_struct *tsk)
{
static inline void print_task(struct task_struct *tsk)
{
- printk("Task pid %d
\n", tsk->p
id);
+ printk("Task pid %d
:#%u\n", tsk->pid, tsk->x
id);
}
static pte_t *lookup_pte(struct mm_struct *mm, unsigned long address)
}
static pte_t *lookup_pte(struct mm_struct *mm, unsigned long address)
@@
-154,7
+154,7
@@
asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
* If we're in an interrupt or have no user
* context, we must not take the fault..
*/
* If we're in an interrupt or have no user
* context, we must not take the fault..
*/
- if (in_
interrupt
() || !mm)
+ if (in_
atomic
() || !mm)
goto no_context;
/* TLB misses upon some cache flushes get done under cli() */
goto no_context;
/* TLB misses upon some cache flushes get done under cli() */
@@
-277,7
+277,7
@@
bad_area:
show_regs(regs);
#endif
}
show_regs(regs);
#endif
}
- if (
tsk->pid == 1
) {
+ if (
is_init(tsk)
) {
panic("INIT had user mode bad_area\n");
}
tsk->thread.address = address;
panic("INIT had user mode bad_area\n");
}
tsk->thread.address = address;
@@
-319,19
+319,20
@@
no_context:
* us unable to handle the page fault gracefully.
*/
out_of_memory:
* us unable to handle the page fault gracefully.
*/
out_of_memory:
- if (
current->pid == 1
) {
+ if (
is_init(current)
) {
panic("INIT out of memory\n");
yield();
goto survive;
}
printk("fault:Out of memory\n");
up_read(&mm->mmap_sem);
panic("INIT out of memory\n");
yield();
goto survive;
}
printk("fault:Out of memory\n");
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", 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;
if (user_mode(regs))
do_exit(SIGKILL);
goto no_context;