Skip to content

Commit

Permalink
[PATCH] uml: fix compilation with CONFIG_MODE_TT disabled
Browse files Browse the repository at this point in the history
Fix UML compilation when SKAS mode is disabled. Indeed, we were compiling
SKAS-only object files, which failed due to some SKAS-only headers being
excluded from the search path.

Thanks to the bug report from Pekka J Enberg.

Acked-by: Pekka J Enberg <penberg (at) cs ! helsinki ! fi>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Paolo 'Blaisorblade' Giarrusso authored and Linus Torvalds committed Dec 29, 2005
1 parent 74433c0 commit 63b4444
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
8 changes: 5 additions & 3 deletions arch/um/sys-i386/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
obj-y = bitops.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
ptrace_user.o semaphore.o signal.o sigcontext.o stub.o stub_segv.o \
syscalls.o sysrq.o sys_call_table.o
obj-y := bitops.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
ptrace_user.o semaphore.o signal.o sigcontext.o syscalls.o sysrq.o \
sys_call_table.o

obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o

obj-$(CONFIG_HIGHMEM) += highmem.o
obj-$(CONFIG_MODULES) += module.o
Expand Down
5 changes: 3 additions & 2 deletions arch/um/sys-x86_64/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@

#XXX: why into lib-y?
lib-y = bitops.o bugs.o csum-partial.o delay.o fault.o ldt.o mem.o memcpy.o \
ptrace.o ptrace_user.o sigcontext.o signal.o stub.o \
stub_segv.o syscalls.o syscall_table.o sysrq.o thunk.o
ptrace.o ptrace_user.o sigcontext.o signal.o syscalls.o \
syscall_table.o sysrq.o thunk.o
lib-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o

obj-y := ksyms.o
obj-$(CONFIG_MODULES) += module.o um_module.o
Expand Down

0 comments on commit 63b4444

Please sign in to comment.