Commit 2dc5802a authored by Karol Swietlicki's avatar Karol Swietlicki Committed by Linus Torvalds
Browse files

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: default avatarKarol Swietlicki <>
Signed-off-by: default avatarJeff Dike <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent fee64d3c
......@@ -95,23 +95,6 @@ config LD_SCRIPT_DYN
default y
depends on !LD_SCRIPT_STATIC
config NET
bool "Networking support"
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
source "fs/Kconfig.binfmt"
config HOSTFS
# Copyright (C) 2002 Jeff Dike (
# Licensed under the GPL
......@@ -741,7 +741,6 @@ void mconsole_stack(struct mc_request *req)
char *ptr = req->;
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)
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);
......@@ -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);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment