Patchwork [v2,2/4] powerpc: Add new save_tar() register function.

login
register
mail settings
Submitter Michael Neuling
Date Aug. 8, 2013, 2:33 a.m.
Message ID <1375929237-19944-2-git-send-email-mikey@neuling.org>
Download mbox | patch
Permalink /patch/265636/
State Changes Requested
Headers show

Comments

Michael Neuling - Aug. 8, 2013, 2:33 a.m.
Add save_tar() function to save the Target Address Register (TAR).  This will
be used in a future patch to save the TAR earlier than it currently is.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Cc: <stable@vger.kernel.org>
---
 arch/powerpc/include/asm/switch_to.h | 9 +++++++++
 arch/powerpc/kernel/entry_64.S       | 1 -
 2 files changed, 9 insertions(+), 1 deletion(-)

Patch

diff --git a/arch/powerpc/include/asm/switch_to.h b/arch/powerpc/include/asm/switch_to.h
index 49a13e0..294c2ce 100644
--- a/arch/powerpc/include/asm/switch_to.h
+++ b/arch/powerpc/include/asm/switch_to.h
@@ -15,6 +15,15 @@  extern struct task_struct *__switch_to(struct task_struct *,
 struct thread_struct;
 extern struct task_struct *_switch(struct thread_struct *prev,
 				   struct thread_struct *next);
+#ifdef CONFIG_PPC_BOOK3S_64
+static inline void save_tar(struct thread_struct *prev)
+{
+	if (cpu_has_feature(CPU_FTR_ARCH_207S))
+		prev->tar = mfspr(SPRN_TAR);
+}
+#else
+static inline void save_tar(struct thread_struct *prev) {}
+#endif
 
 extern void giveup_fpu(struct task_struct *);
 extern void load_up_fpu(void);
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 4674fe6..cfb6de4 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -389,7 +389,6 @@  DSCR_DEFAULT:
 	.tc dscr_default[TC],dscr_default
 
 	.section	".text"
-
 /*
  * This routine switches between two different tasks.  The process
  * state of one is saved on its kernel stack.  Then the state