summaryrefslogtreecommitdiffstats
path: root/arch/cris/kernel/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-12 12:24:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-12 12:24:29 -0700
commit6917b51dee54f21816706af2278517b7af218f9a (patch)
treea7f94bae96cbf4382a6639668262c4c76dcfc6e1 /arch/cris/kernel/Makefile
parent10fbd36e362a0f367e34a7cd876a81295d8fc5ca (diff)
parent254a0f4135482dc02701562a38e10675a48c8ddf (diff)
downloadlinux-6917b51dee54f21816706af2278517b7af218f9a.tar.gz
linux-6917b51dee54f21816706af2278517b7af218f9a.tar.bz2
linux-6917b51dee54f21816706af2278517b7af218f9a.zip
Merge tag 'cris-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris
Pull CRIS updates from Jesper Nilsson: "Mostly removal of old cruft of which we can use a generic version, or fixes for code not commonly run in the cris port, but also additions to enable some good debug" * tag 'cris-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris: (25 commits) CRISv10: delete unused lib/dmacopy.c CRISv10: delete unused lib/old_checksum.c CRIS: fix switch_mm() lockdep splat CRISv32: enable LOCKDEP_SUPPORT CRIS: add STACKTRACE_SUPPORT CRISv32: annotate irq enable in idle loop CRISv32: add support for irqflags tracing CRIS: UAPI: use generic types.h CRIS: UAPI: use generic shmbuf.h CRIS: UAPI: use generic msgbuf.h CRIS: UAPI: use generic socket.h CRIS: UAPI: use generic sembuf.h CRIS: UAPI: use generic sockios.h CRIS: UAPI: use generic auxvec.h CRIS: UAPI: use generic headers via Kbuild CRIS: UAPI: fix elf.h export CRIS: don't make asm/elf.h depend on asm/user.h CRIS: UAPI: fix ptrace.h CRISv32: Squash compile warnings for axisflashmap CRISv32: Add GPIO driver to the default configs ...
Diffstat (limited to 'arch/cris/kernel/Makefile')
-rw-r--r--arch/cris/kernel/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/kernel/Makefile b/arch/cris/kernel/Makefile
index edef71f12bb8..5fae398ca915 100644
--- a/arch/cris/kernel/Makefile
+++ b/arch/cris/kernel/Makefile
@@ -8,6 +8,7 @@ extra-y := vmlinux.lds
obj-y := process.o traps.o irq.o ptrace.o setup.o time.o sys_cris.o
obj-y += devicetree.o
+obj-y += stacktrace.o
obj-$(CONFIG_MODULES) += crisksyms.o
obj-$(CONFIG_MODULES) += module.o