From 2dc5802a22d68d83ef4c3d616912949a6527bb65 Mon Sep 17 00:00:00 2001
From: Karol Swietlicki <magotari@gmail.com>
Date: Mon, 4 Feb 2008 22:31:03 -0800
Subject: 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>
---
arch/um/kernel/process.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'arch/um/kernel')
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 7a29123..e6d89ad 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);
--
cgit v1.1