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

[PATCH] uml: clean up remapping code build magic

kills unmap magic

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Al Viro and committed by
Linus Torvalds 7b99edc7 de2fe5e0

+7 -27
+1 -1
arch/um/Makefile
··· 129 129 -DSTART=$(START) -DELF_ARCH=$(ELF_ARCH) \ 130 130 -DELF_FORMAT="$(ELF_FORMAT)" $(CPP_MODE-y) \ 131 131 -DKERNEL_STACK_SIZE=$(STACK_SIZE) \ 132 - -DUNMAP_PATH=arch/um/sys-$(SUBARCH)/unmap_fin.o 132 + -DUNMAP_PATH=arch/um/sys-$(SUBARCH)/unmap.o 133 133 134 134 #The wrappers will select whether using "malloc" or the kernel allocator. 135 135 LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
-22
arch/um/scripts/Makefile.unmap
··· 1 - clean-files += unmap_tmp.o unmap_fin.o unmap.o 2 - 3 - ifdef CONFIG_MODE_TT 4 - 5 - #Always build unmap_fin.o 6 - extra-y += unmap_fin.o 7 - #Do dependency tracking for unmap.o (it will be always built, but won't get the tracking unless we use this). 8 - targets += unmap.o 9 - 10 - #XXX: partially copied from arch/um/scripts/Makefile.rules 11 - $(obj)/unmap.o: _c_flags = $(call unprofile,$(CFLAGS)) 12 - 13 - quiet_cmd_wrapld = LD $@ 14 - define cmd_wrapld 15 - $(LD) $(LDFLAGS) -r -o $(obj)/unmap_tmp.o $< ; \ 16 - $(OBJCOPY) $(UML_OBJCOPYFLAGS) $(obj)/unmap_tmp.o $@ -G switcheroo 17 - endef 18 - 19 - $(obj)/unmap_fin.o : $(obj)/unmap.o FORCE 20 - $(call if_changed,wrapld) 21 - 22 - endif
+3 -2
arch/um/sys-i386/Makefile
··· 11 11 12 12 include arch/um/scripts/Makefile.rules 13 13 14 - $(obj)/stub_segv.o : _c_flags = $(call unprofile,$(CFLAGS)) 14 + extra-$(CONFIG_MODE_TT) += unmap.o 15 15 16 - include arch/um/scripts/Makefile.unmap 16 + $(obj)/stub_segv.o $(obj)/unmap.o: \ 17 + _c_flags = $(call unprofile,$(CFLAGS))
+3 -2
arch/um/sys-x86_64/Makefile
··· 19 19 20 20 include arch/um/scripts/Makefile.rules 21 21 22 - $(obj)/stub_segv.o: _c_flags = $(call unprofile,$(CFLAGS)) 22 + extra-$(CONFIG_MODE_TT) += unmap.o 23 23 24 - include arch/um/scripts/Makefile.unmap 24 + $(obj)/stub_segv.o $(obj)/unmap.o: \ 25 + _c_flags = $(call unprofile,$(CFLAGS))