aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh64/mm
diff options
context:
space:
mode:
authorSukadev Bhattiprolu <sukadev@us.ibm.com>2006-09-29 05:00:07 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 12:18:12 -0400
commitf400e198b2ed26ce55b22a1412ded0896e7516ac (patch)
treea3d78bfc1c20635e199fe0fe85aaa1d8792acc58 /arch/sh64/mm
parent959ed340f4867fda7684340625f60e211c2296d6 (diff)
[PATCH] pidspace: is_init()
This is an updated version of Eric Biederman's is_init() patch. (http://lkml.org/lkml/2006/2/6/280). It applies cleanly to 2.6.18-rc3 and replaces a few more instances of ->pid == 1 with is_init(). Further, is_init() checks pid and thus removes dependency on Eric's other patches for now. Eric's original description: There are a lot of places in the kernel where we test for init because we give it special properties. Most significantly init must not die. This results in code all over the kernel test ->pid == 1. Introduce is_init to capture this case. With multiple pid spaces for all of the cases affected we are looking for only the first process on the system, not some other process that has pid == 1. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Sukadev Bhattiprolu <sukadev@us.ibm.com> Cc: Dave Hansen <haveblue@us.ibm.com> Cc: Serge Hallyn <serue@us.ibm.com> Cc: Cedric Le Goater <clg@fr.ibm.com> Cc: <lxc-devel@lists.sourceforge.net> Acked-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sh64/mm')
-rw-r--r--arch/sh64/mm/fault.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh64/mm/fault.c b/arch/sh64/mm/fault.c
index f08d0eaf6497..8e2f6c28b739 100644
--- a/arch/sh64/mm/fault.c
+++ b/arch/sh64/mm/fault.c
@@ -277,7 +277,7 @@ bad_area:
277 show_regs(regs); 277 show_regs(regs);
278#endif 278#endif
279 } 279 }
280 if (tsk->pid == 1) { 280 if (is_init(tsk)) {
281 panic("INIT had user mode bad_area\n"); 281 panic("INIT had user mode bad_area\n");
282 } 282 }
283 tsk->thread.address = address; 283 tsk->thread.address = address;
@@ -319,14 +319,14 @@ no_context:
319 * us unable to handle the page fault gracefully. 319 * us unable to handle the page fault gracefully.
320 */ 320 */
321out_of_memory: 321out_of_memory:
322 if (current->pid == 1) { 322 if (is_init(current)) {
323 panic("INIT out of memory\n"); 323 panic("INIT out of memory\n");
324 yield(); 324 yield();
325 goto survive; 325 goto survive;
326 } 326 }
327 printk("fault:Out of memory\n"); 327 printk("fault:Out of memory\n");
328 up_read(&mm->mmap_sem); 328 up_read(&mm->mmap_sem);
329 if (current->pid == 1) { 329 if (is_init(current)) {
330 yield(); 330 yield();
331 down_read(&mm->mmap_sem); 331 down_read(&mm->mmap_sem);
332 goto survive; 332 goto survive;