diff mbox series

[v2,1/2] selftests/powerpc: Move UCONTEXT_NIA() into utils.h

Message ID 27b2e81dfdb95182e99b7063f23539a23004203a.1526915409.git.naveen.n.rao@linux.vnet.ibm.com (mailing list archive)
State Accepted
Commit db3848515aff369404c31ef5a63699799913518f
Headers show
Series selftests/powerpc: Add test for rfi_flush | expand

Commit Message

Naveen N. Rao May 21, 2018, 3:13 p.m. UTC
... so that it can be used by others.

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
---
 tools/testing/selftests/powerpc/include/utils.h           | 8 ++++++++
 .../selftests/powerpc/primitives/load_unaligned_zeropad.c | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

Comments

Michael Ellerman Oct. 22, 2018, 9:34 a.m. UTC | #1
On Mon, 2018-05-21 at 15:13:56 UTC, "Naveen N. Rao" wrote:
> ... so that it can be used by others.
> 
> Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>

Series applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/db3848515aff369404c31ef5a63699

cheers
diff mbox series

Patch

diff --git a/tools/testing/selftests/powerpc/include/utils.h b/tools/testing/selftests/powerpc/include/utils.h
index 735815b3ad7f..b8f9cc6c9ff2 100644
--- a/tools/testing/selftests/powerpc/include/utils.h
+++ b/tools/testing/selftests/powerpc/include/utils.h
@@ -78,4 +78,12 @@  do {								\
 #define PPC_FEATURE2_ARCH_3_00 0x00800000
 #endif
 
+#if defined(__powerpc64__)
+#define UCONTEXT_NIA(UC)	(UC)->uc_mcontext.gp_regs[PT_NIP]
+#elif defined(__powerpc__)
+#define UCONTEXT_NIA(UC)	(UC)->uc_mcontext.uc_regs->gregs[PT_NIP]
+#else
+#error implement UCONTEXT_NIA
+#endif
+
 #endif /* _SELFTESTS_POWERPC_UTILS_H */
diff --git a/tools/testing/selftests/powerpc/primitives/load_unaligned_zeropad.c b/tools/testing/selftests/powerpc/primitives/load_unaligned_zeropad.c
index ed3239bbfae2..ee1e9ca22f0d 100644
--- a/tools/testing/selftests/powerpc/primitives/load_unaligned_zeropad.c
+++ b/tools/testing/selftests/powerpc/primitives/load_unaligned_zeropad.c
@@ -65,14 +65,6 @@  static int unprotect_region(void)
 extern char __start___ex_table[];
 extern char __stop___ex_table[];
 
-#if defined(__powerpc64__)
-#define UCONTEXT_NIA(UC)	(UC)->uc_mcontext.gp_regs[PT_NIP]
-#elif defined(__powerpc__)
-#define UCONTEXT_NIA(UC)	(UC)->uc_mcontext.uc_regs->gregs[PT_NIP]
-#else
-#error implement UCONTEXT_NIA
-#endif
-
 struct extbl_entry {
 	int insn;
 	int fixup;