From 326b98927ac5c0ab95e57a8dcbb23d1ad4153595 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Sat, 31 Dec 2016 22:12:08 +0000
Subject: [PATCH] defs.h: stop including <asm/unistd.h>

Limit the number of files where <asm/unistd.h> is included
to only those few that need it.

* defs.h: Do not include <asm/unistd.h>.
* clone.c: Include <asm/unistd.h>.
* strace.c: Likewise.
* syscall.c: Likewise.
* util.c: Likewise.
---
 clone.c   | 2 +-
 defs.h    | 1 -
 strace.c  | 1 +
 syscall.c | 3 +++
 util.c    | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/clone.c b/clone.c
index b5221f9d..5c60fbe4 100644
--- a/clone.c
+++ b/clone.c
@@ -30,8 +30,8 @@
  */
 
 #include "defs.h"
-
 #include <sched.h>
+#include <asm/unistd.h>
 
 #ifndef CSIGNAL
 # define CSIGNAL 0x000000ff
diff --git a/defs.h b/defs.h
index 83d28f04..934d21c2 100644
--- a/defs.h
+++ b/defs.h
@@ -51,7 +51,6 @@
 #include <errno.h>
 #include <time.h>
 #include <sys/time.h>
-#include <asm/unistd.h>
 
 #include "kernel_types.h"
 #include "mpers_type.h"
diff --git a/strace.c b/strace.c
index 9df942ec..e95e64ce 100644
--- a/strace.c
+++ b/strace.c
@@ -43,6 +43,7 @@
 #ifdef HAVE_PRCTL
 # include <sys/prctl.h>
 #endif
+#include <asm/unistd.h>
 
 #include "ptrace.h"
 #include "printsiginfo.h"
diff --git a/syscall.c b/syscall.c
index c821d7ef..9de30566 100644
--- a/syscall.c
+++ b/syscall.c
@@ -39,6 +39,9 @@
 /* for struct iovec */
 #include <sys/uio.h>
 
+/* for __X32_SYSCALL_BIT */
+#include <asm/unistd.h>
+
 #include "regs.h"
 #include "ptrace.h"
 
diff --git a/util.c b/util.c
index 67a847f7..08880bf9 100644
--- a/util.c
+++ b/util.c
@@ -39,6 +39,7 @@
 # include <sys/xattr.h>
 #endif
 #include <sys/uio.h>
+#include <asm/unistd.h>
 
 #include "regs.h"
 #include "ptrace.h"
-- 
2.40.0