diff options
| author | Jeff Dike <jdike@addtoit.com> | 2008-02-05 01:31:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:32 -0500 |
| commit | 827b3f6abc21246928e38480bb308936701a2ad4 (patch) | |
| tree | 9d34cb61f4a5e62d789476449ceca88f3cd7b7f0 | |
| parent | f87ea91d988637b3bbf6aa2d281c6010e7d5f48d (diff) | |
uml: make mconsole_stack namespace-aware
Also fixed the include syntax while I was there.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/um/drivers/mconsole_kern.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 9820fdbb9c73..ebb265c07e4d 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
| @@ -1,24 +1,25 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) | 2 | * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) |
| 3 | * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | 3 | * Copyright (C) 2001 - 2008 Jeff Dike (jdike@{addtoit,linux.intel}.com) |
| 4 | * Licensed under the GPL | 4 | * Licensed under the GPL |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include "linux/console.h" | 7 | #include <linux/console.h> |
| 8 | #include "linux/ctype.h" | 8 | #include <linux/ctype.h> |
| 9 | #include "linux/interrupt.h" | 9 | #include <linux/interrupt.h> |
| 10 | #include "linux/list.h" | 10 | #include <linux/list.h> |
| 11 | #include "linux/mm.h" | 11 | #include <linux/mm.h> |
| 12 | #include "linux/module.h" | 12 | #include <linux/module.h> |
| 13 | #include "linux/notifier.h" | 13 | #include <linux/notifier.h> |
| 14 | #include "linux/reboot.h" | 14 | #include <linux/reboot.h> |
| 15 | #include "linux/proc_fs.h" | 15 | #include <linux/proc_fs.h> |
| 16 | #include "linux/slab.h" | 16 | #include <linux/slab.h> |
| 17 | #include "linux/syscalls.h" | 17 | #include <linux/syscalls.h> |
| 18 | #include "linux/utsname.h" | 18 | #include <linux/utsname.h> |
| 19 | #include "linux/workqueue.h" | 19 | #include <linux/workqueue.h> |
| 20 | #include "linux/mutex.h" | 20 | #include <linux/mutex.h> |
| 21 | #include "asm/uaccess.h" | 21 | #include <asm/uaccess.h> |
| 22 | |||
| 22 | #include "init.h" | 23 | #include "init.h" |
| 23 | #include "irq_kern.h" | 24 | #include "irq_kern.h" |
| 24 | #include "irq_user.h" | 25 | #include "irq_user.h" |
| @@ -765,7 +766,7 @@ void mconsole_stack(struct mc_request *req) | |||
| 765 | return; | 766 | return; |
| 766 | } | 767 | } |
| 767 | 768 | ||
| 768 | to = find_task_by_pid(pid_requested); | 769 | to = find_task_by_pid_ns(pid_requested, &init_pid_ns); |
| 769 | if ((to == NULL) || (pid_requested == 0)) { | 770 | if ((to == NULL) || (pid_requested == 0)) { |
| 770 | mconsole_reply(req, "Couldn't find that pid", 1, 0); | 771 | mconsole_reply(req, "Couldn't find that pid", 1, 0); |
| 771 | return; | 772 | return; |
