diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 05:49:02 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 05:49:02 +0400 |
| commit | 31003e3a9df675f1ac85d7bcf8e5a5d622576375 (patch) | |
| tree | 6b08171deca1bf3cdcd6968ce0859e505048c73a /arch/um/kernel/Makefile | |
| parent | 1ee07ef6b5db7235b133ee257a3adf507697e6b3 (diff) | |
| parent | 5f786595a291092d20fafe10c5a30378971a8cc3 (diff) | |
| download | linux-31003e3a9df675f1ac85d7bcf8e5a5d622576375.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML update from Richard Weinberger:
"Besides of fixes this contains also support for CONFIG_STACKTRACE by
Daniel Walter"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: net: Eliminate NULL test after alloc_bootmem
um: Add support for CONFIG_STACKTRACE
um: ubd: Fix for processes stuck in D state forever
um: delete unnecessary bootmem struct page array
um: remove csum_partial_copy_generic_i386 to clean up exception table
Diffstat (limited to 'arch/um/kernel/Makefile')
| -rw-r--r-- | arch/um/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile index d8b78a03855c..2d840a070c8b 100644 --- a/arch/um/kernel/Makefile +++ b/arch/um/kernel/Makefile @@ -19,6 +19,7 @@ obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o obj-$(CONFIG_GPROF) += gprof_syms.o obj-$(CONFIG_GCOV) += gmon_syms.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +obj-$(CONFIG_STACKTRACE) += stacktrace.o USER_OBJS := config.o |