The patch titled
uml: include tidying
has been added to the -mm tree. Its filename is
uml-include-tidying.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: uml: include tidying
From: Jeff Dike <jdike@xxxxxxxxxxx>
In order to get the __NR_* constants, we need sys/syscall.h.
linux/unistd.h works as well since it includes syscall.h, however syscall.h
is more parsimonious. We were inconsistent in this, and this patch adds
syscall.h includes where necessary and removes linux/unistd.h includes
where they are not needed.
asm/unistd.h also includes the __NR_* constants, but these are not the
glibc-sanctioned ones, so this also removes one such inclusion.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/os-Linux/process.c | 1 -
arch/um/os-Linux/skas/process.c | 2 +-
arch/um/os-Linux/tls.c | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff -puN arch/um/os-Linux/process.c~uml-include-tidying arch/um/os-Linux/process.c
--- a/arch/um/os-Linux/process.c~uml-include-tidying
+++ a/arch/um/os-Linux/process.c
@@ -7,7 +7,6 @@
#include <stdio.h>
#include <errno.h>
#include <signal.h>
-#include <linux/unistd.h>
#include <sys/mman.h>
#include <sys/wait.h>
#include <sys/mman.h>
diff -puN arch/um/os-Linux/skas/process.c~uml-include-tidying arch/um/os-Linux/skas/process.c
--- a/arch/um/os-Linux/skas/process.c~uml-include-tidying
+++ a/arch/um/os-Linux/skas/process.c
@@ -14,7 +14,7 @@
#include <sys/mman.h>
#include <sys/user.h>
#include <sys/time.h>
-#include <asm/unistd.h>
+#include <sys/syscall.h>
#include <asm/types.h>
#include "user.h"
#include "sysdep/ptrace.h"
diff -puN arch/um/os-Linux/tls.c~uml-include-tidying arch/um/os-Linux/tls.c
--- a/arch/um/os-Linux/tls.c~uml-include-tidying
+++ a/arch/um/os-Linux/tls.c
@@ -1,7 +1,7 @@
#include <errno.h>
+#include <unistd.h>
#include <sys/ptrace.h>
#include <sys/syscall.h>
-#include <unistd.h>
#include <asm/ldt.h>
#include "sysdep/tls.h"
#include "uml-config.h"
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
uml-fix-i-o-hang.patch
uml-include-tidying.patch
uml-fix-prototypes.patch
uml-make-execvp-safe-for-our-usage.patch
tty-signal-tty-locking.patch
uml-add-generic-bug-support.patch
add-process_session-helper-routine-deprecate-old-field-fix-warnings-fix.patch
tty-switch-to-ktermios-uml-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
