summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--backends/ChangeLog4
-rw-r--r--backends/s390_initreg.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/backends/ChangeLog b/backends/ChangeLog
index c5f61e85..d6282451 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-17 Mark Wielaard <[email protected]>
+
+ * s390_initreg.c: Swap sys/ptrace.h and asm/ptrace.h include order.
+
2017-06-15 Andreas Schwab <[email protected]>
* ppc_symbol.c (ppc_machine_flag_check): New function.
diff --git a/backends/s390_initreg.c b/backends/s390_initreg.c
index 011305ce..23bf8edc 100644
--- a/backends/s390_initreg.c
+++ b/backends/s390_initreg.c
@@ -34,8 +34,8 @@
#include <assert.h>
#if defined(__s390__) && defined(__linux__)
# include <sys/user.h>
-# include <asm/ptrace.h>
# include <sys/ptrace.h>
+# include <asm/ptrace.h>
#endif
#define BACKEND s390_