Messages in this thread Patch in this message | | | Subject | [PATCH 2/2] UML - Include tidying | Date | Wed, 01 Nov 2006 12:32:41 -0500 | From | Jeff Dike <> |
| |
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@addtoit.com>
Index: linux-2.6.18-mm/arch/um/os-Linux/process.c =================================================================== --- linux-2.6.18-mm.orig/arch/um/os-Linux/process.c 2006-10-30 12:57:27.000000000 -0500 +++ linux-2.6.18-mm/arch/um/os-Linux/process.c 2006-10-30 15:25:20.000000000 -0500 @@ -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> Index: linux-2.6.18-mm/arch/um/os-Linux/skas/process.c =================================================================== --- linux-2.6.18-mm.orig/arch/um/os-Linux/skas/process.c 2006-10-30 13:11:24.000000000 -0500 +++ linux-2.6.18-mm/arch/um/os-Linux/skas/process.c 2006-10-30 15:26:38.000000000 -0500 @@ -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" Index: linux-2.6.18-mm/arch/um/os-Linux/tls.c =================================================================== --- linux-2.6.18-mm.orig/arch/um/os-Linux/tls.c 2006-10-30 12:57:27.000000000 -0500 +++ linux-2.6.18-mm/arch/um/os-Linux/tls.c 2006-10-30 15:25:55.000000000 -0500 @@ -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" - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |