summaryrefslogtreecommitdiffstats
path: root/arch/um/sys-i386
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 20:01:29 +0100
committerRichard Weinberger <richard@nod.at>2011-11-02 14:14:44 +0100
commit078073a3d48ce7c140f1538d249da3ac545065a6 (patch)
tree064e0baa9b1a6d97d5dbbbfae388a297303fba65 /arch/um/sys-i386
parent4de1c5f65c7dd4965a2a58b93205b747d7826110 (diff)
um: -include user.h for USER_OBJ, trim includes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/sys-i386')
-rw-r--r--arch/um/sys-i386/Makefile2
-rw-r--r--arch/um/sys-i386/bugs.c2
-rw-r--r--arch/um/sys-i386/shared/sysdep/stub.h1
3 files changed, 1 insertions, 4 deletions
diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index e5e56d76dec..231bb983a12 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -15,8 +15,8 @@ subarch-obj-$(CONFIG_MODULES) += kernel/module.o
USER_OBJS := bugs.o ptrace_user.o fault.o
-USER_OBJS += user-offsets.s
extra-y += user-offsets.s
+$(obj)/user-offsets.s: c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS)
UNPROFILE_OBJS := stub_segv.o
CFLAGS_stub_segv.o := $(CFLAGS_NO_HARDENING)
diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
index 2c6d0d731c1..7058e1fa903 100644
--- a/arch/um/sys-i386/bugs.c
+++ b/arch/um/sys-i386/bugs.c
@@ -4,11 +4,9 @@
*/
#include <signal.h>
-#include "kern_constants.h"
#include "kern_util.h"
#include "longjmp.h"
#include "task.h"
-#include "user.h"
#include "sysdep/ptrace.h"
/* Set during early boot */
diff --git a/arch/um/sys-i386/shared/sysdep/stub.h b/arch/um/sys-i386/shared/sysdep/stub.h
index 977dedd9221..cca14d4ddf5 100644
--- a/arch/um/sys-i386/shared/sysdep/stub.h
+++ b/arch/um/sys-i386/shared/sysdep/stub.h
@@ -11,7 +11,6 @@
#include <asm/unistd.h>
#include "as-layout.h"
#include "stub-data.h"
-#include "kern_constants.h"
extern void stub_segv_handler(int sig);
extern void stub_clone_handler(void);