Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f6f6164 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: include tidying 



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: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 53b17332

arch/um/os-Linux/process.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/um/os-Linux/skas/process.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

arch/um/os-Linux/tls.c

+1 −1
Original line number Diff line number Diff line 
#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"