summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorKarol Swietlicki <magotari@gmail.com>2008-02-04 22:31:03 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 09:44:29 -0800
commit2dc5802a22d68d83ef4c3d616912949a6527bb65 (patch)
tree5313ac550d2c7c81a0d22adaf14a0b9d31a0f57f /arch
parentfee64d3c153f1d5c28f91214b4d0db54d3f1fe0a (diff)
uml: remove duplicate config symbol and unused file and variables
Fix the repetition of the NET symbol. It was once in UML specific options and once in networking. I removed the first occurrence, as it makes more sense to me to keep it only in networking. It also removes a mostly empty file which is not used anymore and some unused variables. Signed-off-by: Karol Swietlicki <magotari@gmail.com> Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/Kconfig17
-rw-r--r--arch/um/Makefile-tt5
-rw-r--r--arch/um/drivers/mconsole_kern.c3
-rw-r--r--arch/um/kernel/process.c4
4 files changed, 2 insertions, 27 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 58f5a141faa9..a967d95603cb 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -95,23 +95,6 @@ config LD_SCRIPT_DYN
default y
depends on !LD_SCRIPT_STATIC
-config NET
- bool "Networking support"
- help
- Unless you really know what you are doing, you should say Y here.
- The reason is that some programs need kernel networking support even
- when running on a stand-alone machine that isn't connected to any
- other computer. If you are upgrading from an older kernel, you
- should consider updating your networking tools too because changes
- in the kernel and the tools often go hand in hand. The tools are
- contained in the package net-tools, the location and version number
- of which are given in <file:Documentation/Changes>.
-
- For a general introduction to Linux networking, it is highly
- recommended to read the NET-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
-
source "fs/Kconfig.binfmt"
config HOSTFS
diff --git a/arch/um/Makefile-tt b/arch/um/Makefile-tt
deleted file mode 100644
index 03f7b10cfd0b..000000000000
--- a/arch/um/Makefile-tt
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
-# Licensed under the GPL
-#
-
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 0f3c7d14a6e3..fabd75f5bb5c 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -741,7 +741,6 @@ void mconsole_stack(struct mc_request *req)
{
char *ptr = req->request.data;
int pid_requested= -1;
- struct task_struct *from = NULL;
struct task_struct *to = NULL;
/*
@@ -763,8 +762,6 @@ void mconsole_stack(struct mc_request *req)
return;
}
- from = current;
-
to = find_task_by_pid(pid_requested);
if ((to == NULL) || (pid_requested == 0)) {
mconsole_reply(req, "Couldn't find that pid", 1, 0);
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 7a291239242b..e6d89ad10a71 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -30,7 +30,7 @@
*/
struct cpu_task cpu_tasks[NR_CPUS] = { [0 ... NR_CPUS - 1] = { -1, NULL } };
-static inline int external_pid(struct task_struct *task)
+static inline int external_pid(void)
{
/* FIXME: Need to look up userspace_pid by cpu */
return userspace_pid[0];
@@ -78,7 +78,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
static inline void set_current(struct task_struct *task)
{
cpu_tasks[task_thread_info(task)->cpu] = ((struct cpu_task)
- { external_pid(task), task });
+ { external_pid(), task });
}
extern void arch_switch_to(struct task_struct *to);