From 3144487467323aa6ab3da958407733a3e9381c99 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 28 Mar 2012 18:30:03 +0100
Subject: [PATCH] --- yaml --- r: 297253 b: refs/heads/master c:
 158bc507c2f53109bed51c806acf5bfd48d95f1a h: refs/heads/master i:   297251:
 7403672aa5451a0221805ac0eb9afb3cada0e7ba v: v3

---
 [refs]                                |  2 +-
 trunk/include/asm-generic/switch_to.h | 30 +++++++++++++++++++++++++++
 trunk/include/asm-generic/system.h    | 17 +--------------
 3 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 trunk/include/asm-generic/switch_to.h

diff --git a/[refs] b/[refs]
index efb9c1fc9b5f..386da464c601 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4816afa3986704d1404fc48e931da5135820472
+refs/heads/master: 158bc507c2f53109bed51c806acf5bfd48d95f1a
diff --git a/trunk/include/asm-generic/switch_to.h b/trunk/include/asm-generic/switch_to.h
new file mode 100644
index 000000000000..052c4ac04fd5
--- /dev/null
+++ b/trunk/include/asm-generic/switch_to.h
@@ -0,0 +1,30 @@
+/* Generic task switch macro wrapper, based on MN10300 definitions.
+ *
+ * It should be possible to use these on really simple architectures,
+ * but it serves more as a starting point for new ports.
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#ifndef __ASM_GENERIC_SWITCH_TO_H
+#define __ASM_GENERIC_SWITCH_TO_H
+
+#include <linux/thread_info.h>
+
+/*
+ * Context switching is now performed out-of-line in switch_to.S
+ */
+extern struct task_struct *__switch_to(struct task_struct *,
+				       struct task_struct *);
+
+#define switch_to(prev, next, last)					\
+	do {								\
+		((last) = __switch_to((prev), (next)));			\
+	} while (0)
+
+#endif /* __ASM_GENERIC_SWITCH_TO_H */
diff --git a/trunk/include/asm-generic/system.h b/trunk/include/asm-generic/system.h
index 54cd124ea9a4..f2b8eb453cbb 100644
--- a/trunk/include/asm-generic/system.h
+++ b/trunk/include/asm-generic/system.h
@@ -14,25 +14,10 @@
 #ifndef __ASM_GENERIC_SYSTEM_H
 #define __ASM_GENERIC_SYSTEM_H
 
-#ifndef __ASSEMBLY__
-
-#include <linux/types.h>
-
 #include <asm/barrier.h>
 #include <asm/cmpxchg.h>
-
-struct task_struct;
-
-/* context switching is now performed out-of-line in switch_to.S */
-extern struct task_struct *__switch_to(struct task_struct *,
-		struct task_struct *);
-#define switch_to(prev, next, last)					\
-	do {								\
-		((last) = __switch_to((prev), (next)));			\
-	} while (0)
+#include <asm/switch_to.h>
 
 #define arch_align_stack(x) (x)
 
-#endif /* !__ASSEMBLY__ */
-
 #endif /* __ASM_GENERIC_SYSTEM_H */