leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uml: remove duplicate config symbol and unused file and variables

Browse Source 
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>
This commit is contained in:
Karol Swietlicki 2008-02-04 22:31:03 -08:00 committed by Linus Torvalds
parent fee64d3c15
commit 2dc5802a22
4 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/um/Kconfig
View File

@ -95,23 +95,6 @@ config LD_SCRIPT_DYN
default y default y
depends on !LD_SCRIPT_STATIC 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" source "fs/Kconfig.binfmt"
config HOSTFS config HOSTFS

5
arch/um/Makefile-tt
View File

@ -1,5 +0,0 @@
#
# Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
# Licensed under the GPL
#

3
arch/um/drivers/mconsole_kern.c
View File

@ -741,7 +741,6 @@ void mconsole_stack(struct mc_request *req)
{ {
char *ptr = req->request.data; char *ptr = req->request.data;
int pid_requested= -1; int pid_requested= -1;
struct task_struct *from = NULL;
struct task_struct *to = NULL; struct task_struct *to = NULL;
/* /*
@ -763,8 +762,6 @@ void mconsole_stack(struct mc_request *req)
return; return;
} }
from = current;
to = find_task_by_pid(pid_requested); to = find_task_by_pid(pid_requested);
if ((to == NULL) || (pid_requested == 0)) { if ((to == NULL) || (pid_requested == 0)) {
mconsole_reply(req, "Couldn't find that pid", 1, 0); mconsole_reply(req, "Couldn't find that pid", 1, 0);

4
arch/um/kernel/process.c
View File

@ -30,7 +30,7 @@
*/ */
struct cpu_task cpu_tasks[NR_CPUS] = { [0 ... NR_CPUS - 1] = { -1, NULL } }; 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 */ /* FIXME: Need to look up userspace_pid by cpu */
return userspace_pid[0]; 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) static inline void set_current(struct task_struct *task)
{ {
cpu_tasks[task_thread_info(task)->cpu] = ((struct cpu_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); extern void arch_switch_to(struct task_struct *to);