aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/kmsg_dump.h16
-rw-r--r--kernel/printk.c2
2 files changed, 17 insertions, 1 deletions
diff --git a/include/linux/kmsg_dump.h b/include/linux/kmsg_dump.h
index 7f089ec5ef32..e32aa268efac 100644
--- a/include/linux/kmsg_dump.h
+++ b/include/linux/kmsg_dump.h
@@ -35,10 +35,26 @@ struct kmsg_dumper {
35 int registered; 35 int registered;
36}; 36};
37 37
38#ifdef CONFIG_PRINTK
38void kmsg_dump(enum kmsg_dump_reason reason); 39void kmsg_dump(enum kmsg_dump_reason reason);
39 40
40int kmsg_dump_register(struct kmsg_dumper *dumper); 41int kmsg_dump_register(struct kmsg_dumper *dumper);
41 42
42int kmsg_dump_unregister(struct kmsg_dumper *dumper); 43int kmsg_dump_unregister(struct kmsg_dumper *dumper);
44#else
45static inline void kmsg_dump(enum kmsg_dump_reason reason)
46{
47}
48
49static inline int kmsg_dump_register(struct kmsg_dumper *dumper)
50{
51 return -EINVAL;
52}
53
54static inline int kmsg_dump_unregister(struct kmsg_dumper *dumper)
55{
56 return -EINVAL;
57}
58#endif
43 59
44#endif /* _LINUX_KMSG_DUMP_H */ 60#endif /* _LINUX_KMSG_DUMP_H */
diff --git a/kernel/printk.c b/kernel/printk.c
index 051d1f50648f..2a564570f822 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1405,7 +1405,6 @@ bool printk_timed_ratelimit(unsigned long *caller_jiffies,
1405 return false; 1405 return false;
1406} 1406}
1407EXPORT_SYMBOL(printk_timed_ratelimit); 1407EXPORT_SYMBOL(printk_timed_ratelimit);
1408#endif
1409 1408
1410static DEFINE_SPINLOCK(dump_list_lock); 1409static DEFINE_SPINLOCK(dump_list_lock);
1411static LIST_HEAD(dump_list); 1410static LIST_HEAD(dump_list);
@@ -1524,3 +1523,4 @@ void kmsg_dump(enum kmsg_dump_reason reason)
1524 dumper->dump(dumper, reason, s1, l1, s2, l2); 1523 dumper->dump(dumper, reason, s1, l1, s2, l2);
1525 spin_unlock_irqrestore(&dump_list_lock, flags); 1524 spin_unlock_irqrestore(&dump_list_lock, flags);
1526} 1525}
1526#endif