Patched in Tegra support.

1 files changed, 7 insertions, 31 deletions

diff --git a/arch/sparc/include/asm/processor_64.h b/arch/sparc/include/asm/processor_64.h
index cce72ce4c33..59fcebb8f44 100644
--- a/arch/sparc/include/asm/processor_64.h
+++ b/arch/sparc/include/asm/processor_64.h
@@ -18,9 +18,6 @@
 #include <asm/ptrace.h>
 #include <asm/page.h>
 
-/* Don't hold the runqueue lock over context switch */
-#define __ARCH_WANT_UNLOCKED_CTXSW
-
 /* The sparc has no problems with write protection */
 #define wp_works_ok 1
 #define wp_works_ok__is_a_macro /* for versions in ksyms.c */
@@ -42,9 +39,7 @@
 #define TASK_SIZE_OF(tsk) \
         (test_tsk_thread_flag(tsk,TIF_32BIT) ? \
          (1UL << 32UL) : ((unsigned long)-VPTE_SIZE))
-#define TASK_SIZE \
-        (test_thread_flag(TIF_32BIT) ? \
-         (1UL << 32UL) : ((unsigned long)-VPTE_SIZE))
+#define TASK_SIZE       TASK_SIZE_OF(current)
 #ifdef __KERNEL__
 
 #define STACK_TOP32     ((1UL << 32UL) - PAGE_SIZE)
@@ -94,7 +89,6 @@ struct thread_struct {
 #ifndef __ASSEMBLY__
 
 #include <linux/types.h>
-#include <asm/fpumacro.h>
 
 /* Return saved PC of a blocked thread. */
 struct task_struct;
@@ -144,10 +138,6 @@ do { \
         : \
         : "r" (regs), "r" (sp - sizeof(struct reg_window) - STACK_BIAS), \
           "i" ((const unsigned long)(&((struct pt_regs *)0)->u_regs[0]))); \
-        fprs_write(0);  \
-        current_thread_info()->xfsr[0] = 0;     \
-        current_thread_info()->fpsaved[0] = 0;  \
-        regs->tstate &= ~TSTATE_PEF;    \
 } while (0)
 
 #define start_thread32(regs, pc, sp) \
@@ -188,37 +178,23 @@ do { \
         : \
         : "r" (regs), "r" (sp - sizeof(struct reg_window32)), \
           "i" ((const unsigned long)(&((struct pt_regs *)0)->u_regs[0]))); \
-        fprs_write(0);  \
-        current_thread_info()->xfsr[0] = 0;     \
-        current_thread_info()->fpsaved[0] = 0;  \
-        regs->tstate &= ~TSTATE_PEF;    \
 } while (0)
 
 /* Free all resources held by a thread. */
 #define release_thread(tsk)             do { } while (0)
 
+/* Prepare to copy thread state - unlazy all lazy status */
+#define prepare_to_copy(tsk)    do { } while (0)
+
+extern pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
+
 extern unsigned long get_wchan(struct task_struct *task);
 
 #define task_pt_regs(tsk) (task_thread_info(tsk)->kregs)
 #define KSTK_EIP(tsk)  (task_pt_regs(tsk)->tpc)
 #define KSTK_ESP(tsk)  (task_pt_regs(tsk)->u_regs[UREG_FP])
 
-/* Please see the commentary in asm/backoff.h for a description of
- * what these instructions are doing and how they have been choosen.
- * To make a long story short, we are trying to yield the current cpu
- * strand during busy loops.
- */
-#define cpu_relax()     asm volatile("\n99:\n\t"                        \
-                                     "rd        %%ccr, %%g0\n\t"        \
-                                     "rd        %%ccr, %%g0\n\t"        \
-                                     "rd        %%ccr, %%g0\n\t"        \
-                                     ".section  .pause_3insn_patch,\"ax\"\n\t"\
-                                     ".word     99b\n\t"                \
-                                     "wr        %%g0, 128, %%asr27\n\t" \
-                                     "nop\n\t"                          \
-                                     "nop\n\t"                          \
-                                     ".previous"                        \
-                                     ::: "memory")
+#define cpu_relax()     barrier()
 
 /* Prefetch support.  This is tuned for UltraSPARC-III and later.
  * UltraSPARC-I will treat these as nops, and UltraSPARC-II has