From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sun, 24 Dec 2017 18:49:26 +0000 (+0000)
Subject: syscall: move a sparc specific include to an arch specific file
X-Git-Tag: v4.21~238
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9aa434bc6eed5091bd3fbd4533c9076b89217bf5;p=strace

syscall: move a sparc specific include to an arch specific file

* syscall.c [SPARC64]: Do not include <asm/psrcompat.h>.
[SPARC]: Do not include <asm/psr.h>.
* linux/sparc/get_error.c: Include <asm/psr.h>.
---

diff --git a/linux/sparc/get_error.c b/linux/sparc/get_error.c
index 1b960ace..b41bfb37 100644
--- a/linux/sparc/get_error.c
+++ b/linux/sparc/get_error.c
@@ -1,3 +1,5 @@
+#include <asm/psr.h>
+
 static void
 get_error(struct tcb *tcp, const bool check_errno)
 {
diff --git a/syscall.c b/syscall.c
index e2bfff82..dfeaec17 100644
--- a/syscall.c
+++ b/syscall.c
@@ -54,12 +54,6 @@
 # define PTRACE_SETREGS PTRACE_SETREGS64
 #endif
 
-#if defined SPARC64
-# include <asm/psrcompat.h>
-#elif defined SPARC
-# include <asm/psr.h>
-#endif
-
 #ifndef NT_PRSTATUS
 # define NT_PRSTATUS 1
 #endif