diff options
author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 19:10:49 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 19:10:49 +0200 |
commit | 80bd6d7f5e0d872a0f5a151473d2a39d95d210a8 (patch) | |
tree | b3a36048d6b7de88f7e906624ecb4b98816bb736 /arch/um/Makefile | |
parent | Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds... (diff) | |
parent | Merge rsync://oss.sgi.com/git/xfs-2.6 (diff) | |
download | linux-80bd6d7f5e0d872a0f5a151473d2a39d95d210a8.tar.xz linux-80bd6d7f5e0d872a0f5a151473d2a39d95d210a8.zip |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/um/Makefile')
-rw-r--r-- | arch/um/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index f2a0c40a9204..3f073902351f 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -122,7 +122,7 @@ endif CPPFLAGS_vmlinux.lds = $(shell echo -U$(SUBARCH) \ -DSTART=$(START) -DELF_ARCH=$(ELF_ARCH) \ -DELF_FORMAT=\"$(ELF_FORMAT)\" $(CPP_MODE-y) \ - -DKERNEL_STACK_SIZE=$(STACK_SIZE)) + -DKERNEL_STACK_SIZE=$(STACK_SIZE) -DSUBARCH=$(SUBARCH)) #The wrappers will select whether using "malloc" or the kernel allocator. LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc |