diff options
author | Sukadev Bhattiprolu <sukadev@us.ibm.com> | 2006-09-29 05:00:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 12:18:12 -0400 |
commit | f400e198b2ed26ce55b22a1412ded0896e7516ac (patch) | |
tree | a3d78bfc1c20635e199fe0fe85aaa1d8792acc58 /arch/ppc/kernel/traps.c | |
parent | 959ed340f4867fda7684340625f60e211c2296d6 (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/ppc/kernel/traps.c')
-rw-r--r-- | arch/ppc/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c index d7a433049b48..aafc8e8893d1 100644 --- a/arch/ppc/kernel/traps.c +++ b/arch/ppc/kernel/traps.c | |||
@@ -119,7 +119,7 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr) | |||
119 | * generate the same exception over and over again and we get | 119 | * generate the same exception over and over again and we get |
120 | * nowhere. Better to kill it and let the kernel panic. | 120 | * nowhere. Better to kill it and let the kernel panic. |
121 | */ | 121 | */ |
122 | if (current->pid == 1) { | 122 | if (is_init(current)) { |
123 | __sighandler_t handler; | 123 | __sighandler_t handler; |
124 | 124 | ||
125 | spin_lock_irq(¤t->sighand->siglock); | 125 | spin_lock_irq(¤t->sighand->siglock); |