From 7d7c56365ebafcc0815a5807f88ecca0c3e47c7e Mon Sep 17 00:00:00 2001
From: Richard Weinberger <richard@nod.at>
Date: Thu, 29 Mar 2012 19:10:42 +0200
Subject: [PATCH] --- yaml --- r: 298904 b: refs/heads/master c:
 76b278edd99fb55525fcf2706095e388bd3d122c h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/um/include/asm/Kbuild  | 1 +
 trunk/arch/um/kernel/process.c    | 6 +-----
 trunk/arch/x86/um/asm/switch_to.h | 7 -------
 4 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 trunk/arch/x86/um/asm/switch_to.h

diff --git a/[refs] b/[refs]
index ae7380668a71..611d59382ca7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3a85a763c399c0bf483a30d82d2d613e6f94cd3
+refs/heads/master: 76b278edd99fb55525fcf2706095e388bd3d122c
diff --git a/trunk/arch/um/include/asm/Kbuild b/trunk/arch/um/include/asm/Kbuild
index bb5d6e68829b..fff24352255d 100644
--- a/trunk/arch/um/include/asm/Kbuild
+++ b/trunk/arch/um/include/asm/Kbuild
@@ -1,3 +1,4 @@
 generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h
 generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
 generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h
+generic-y += switch_to.h
diff --git a/trunk/arch/um/kernel/process.c b/trunk/arch/um/kernel/process.c
index f386d04a84a5..2b73dedb44ca 100644
--- a/trunk/arch/um/kernel/process.c
+++ b/trunk/arch/um/kernel/process.c
@@ -88,11 +88,8 @@ static inline void set_current(struct task_struct *task)
 
 extern void arch_switch_to(struct task_struct *to);
 
-void *_switch_to(void *prev, void *next, void *last)
+void *__switch_to(struct task_struct *from, struct task_struct *to)
 {
-	struct task_struct *from = prev;
-	struct task_struct *to = next;
-
 	to->thread.prev_sched = from;
 	set_current(to);
 
@@ -111,7 +108,6 @@ void *_switch_to(void *prev, void *next, void *last)
 	} while (current->thread.saved_task);
 
 	return current->thread.prev_sched;
-
 }
 
 void interrupt_end(void)
diff --git a/trunk/arch/x86/um/asm/switch_to.h b/trunk/arch/x86/um/asm/switch_to.h
deleted file mode 100644
index cf97d20da61f..000000000000
--- a/trunk/arch/x86/um/asm/switch_to.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_UM_SWITCH_TO_H_
-#define _ASM_UM_SWITCH_TO_H_
-
-extern void *_switch_to(void *prev, void *next, void *last);
-#define switch_to(prev, next, last) prev = _switch_to(prev, next, last)
-
-#endif