diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-28 10:00:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-28 10:00:52 -0700 |
| commit | 97956605d8f2a0d17706cbd338a6cfe8de1920e9 (patch) | |
| tree | a8d96190e3fa3bd510d599a051f4da65781e41a0 /arch/um/scripts/Makefile.rules | |
| parent | c3a086e638e0cf76b26f6053a096354980af9396 (diff) | |
| parent | 9429ec96c2718c0d1e3317cf60a87a0405223814 (diff) | |
Merge branch 'for-linus-3.6-rc-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fixes from Richard Weinberger.
* 'for-linus-3.6-rc-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Preinclude include/linux/kern_levels.h
um: Fix IPC on um
um: kill thread->forking
um: let signal_delivered() do SIGTRAP on singlestepping into handler
um: don't leak floating point state and segment registers on execve()
um: take cleaning singlestep to start_thread()
Diffstat (limited to 'arch/um/scripts/Makefile.rules')
| -rw-r--r-- | arch/um/scripts/Makefile.rules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules index d50270d26b42..15889df9b466 100644 --- a/arch/um/scripts/Makefile.rules +++ b/arch/um/scripts/Makefile.rules @@ -8,7 +8,7 @@ USER_OBJS += $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS)) USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file)) $(USER_OBJS:.o=.%): \ - c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) -include user.h $(CFLAGS_$(basetarget).o) + c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) -include $(srctree)/include/linux/kern_levels.h -include user.h $(CFLAGS_$(basetarget).o) # These are like USER_OBJS but filter USER_CFLAGS through unprofile instead of # using it directly. |