summaryrefslogtreecommitdiff
path: root/lib/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-06 05:53:30 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-06 05:53:30 +0300
commit357aa6aefebe888c712152cb83c9e700f98eebd1 (patch)
tree5adac02fbfd232e8df56563c3ab2facde669ba9c /lib/Makefile
parentbe88751f320a716a4327596adfe834e162c14532 (diff)
parent47319f7186b8746521b0ee674054b29d7b35578b (diff)
downloadlinux-357aa6aefebe888c712152cb83c9e700f98eebd1.tar.xz
Merge branch 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk
Pull printk updates from Petr Mladek: - Add info about loaded kdump kernel into the dump stack header - Move dump-stack related code from printk.c to lib/dump_stack.c - Write message about suspending consoles in KERN_INFO log level * 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk: printk: change message to pr_info printk: move dump stack related code to lib/dump_stack.c print kdump kernel loaded status in stack dump
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile
index a90d4fcd748f..0bd50d71f423 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -18,7 +18,7 @@ KCOV_INSTRUMENT_debugobjects.o := n
KCOV_INSTRUMENT_dynamic_debug.o := n
lib-y := ctype.o string.o vsprintf.o cmdline.o \
- rbtree.o radix-tree.o dump_stack.o timerqueue.o\
+ rbtree.o radix-tree.o timerqueue.o\
idr.o int_sqrt.o extable.o \
sha1.o chacha20.o irq_regs.o argv_split.o \
flex_proportions.o ratelimit.o show_mem.o \
@@ -26,6 +26,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
earlycpio.o seq_buf.o siphash.o \
nmi_backtrace.o nodemask.o win_minmax.o
+lib-$(CONFIG_PRINTK) += dump_stack.o
lib-$(CONFIG_MMU) += ioremap.o
lib-$(CONFIG_SMP) += cpumask.o
lib-$(CONFIG_DMA_DIRECT_OPS) += dma-direct.o