Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[PATCH] uml: build cleanups

Fix a build failure when CONFIG_MODE_SKAS is disabled and make a Makefile
comment fit in 80 columns.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Jeff Dike and committed by
Linus Torvalds
36ca1195 8447f3f4

+3 -4
+2 -3
arch/um/include/sysdep-i386/ptrace.h
··· 8 8 9 9 #include "uml-config.h" 10 10 #include "user_constants.h" 11 + #include "sysdep/faultinfo.h" 12 + #include "choose-mode.h" 11 13 12 14 #define MAX_REG_NR (UM_FRAME_SIZE / sizeof(unsigned long)) 13 15 #define MAX_REG_OFFSET (UM_FRAME_SIZE) ··· 59 57 #ifndef PTRACE_SYSEMU_SINGLESTEP 60 58 #define PTRACE_SYSEMU_SINGLESTEP 32 61 59 #endif 62 - 63 - #include "sysdep/faultinfo.h" 64 - #include "choose-mode.h" 65 60 66 61 union uml_pt_regs { 67 62 #ifdef UML_CONFIG_MODE_TT
+1 -1
arch/um/scripts/Makefile.rules
··· 14 14 cmd_make_link = ln -sf $(srctree)/arch/$(SUBARCH)/$($(notdir $@)-dir)/$(notdir $@) $@ 15 15 16 16 # this needs to be before the foreach, because targets does not accept 17 - # complete paths like $(obj)/$(f). To make sure this works, use a := assignment, 17 + # complete paths like $(obj)/$(f). To make sure this works, use a := assignment 18 18 # or we will get $(obj)/$(f) in the "targets" value. 19 19 # Also, this forces you to use the := syntax when assigning to targets. 20 20 # Otherwise the line below will cause an infinite loop (if you don't know why,