diff options
| author | Petr Mladek <pmladek@suse.com> | 2020-10-12 13:01:37 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2020-10-12 13:01:37 +0200 |
| commit | 70333f4ff9c16dd82a2667080c3ae48fe30a3cb4 (patch) | |
| tree | df9a785cca8bd73c1a1962c2cc66b1702d9a4ebd /include/linux | |
| parent | 4e797e6ec79c0705791c14f3e60f38b01c78ea1d (diff) | |
| parent | 0463d04ea03a12d8a5aad42197a5945dfd78d7d6 (diff) | |
Merge branch 'printk-rework' into for-linus
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/crash_core.h | 3 | ||||
| -rw-r--r-- | include/linux/dev_printk.h | 8 | ||||
| -rw-r--r-- | include/linux/printk.h | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h index 525510a9f965..43b51c9df571 100644 --- a/include/linux/crash_core.h +++ b/include/linux/crash_core.h @@ -53,6 +53,9 @@ phys_addr_t paddr_vmcoreinfo_note(void); #define VMCOREINFO_OFFSET(name, field) \ vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \ (unsigned long)offsetof(struct name, field)) +#define VMCOREINFO_TYPE_OFFSET(name, field) \ + vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \ + (unsigned long)offsetof(name, field)) #define VMCOREINFO_LENGTH(name, value) \ vmcoreinfo_append_str("LENGTH(%s)=%lu\n", #name, (unsigned long)value) #define VMCOREINFO_NUMBER(name) \ diff --git a/include/linux/dev_printk.h b/include/linux/dev_printk.h index 3028b644b4fb..6f009559ee54 100644 --- a/include/linux/dev_printk.h +++ b/include/linux/dev_printk.h @@ -21,6 +21,14 @@ struct device; +#define PRINTK_INFO_SUBSYSTEM_LEN 16 +#define PRINTK_INFO_DEVICE_LEN 48 + +struct dev_printk_info { + char subsystem[PRINTK_INFO_SUBSYSTEM_LEN]; + char device[PRINTK_INFO_DEVICE_LEN]; +}; + #ifdef CONFIG_PRINTK __printf(3, 0) __cold diff --git a/include/linux/printk.h b/include/linux/printk.h index f749a2c2e7a5..78479633ccfc 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -161,10 +161,12 @@ static inline void printk_nmi_direct_enter(void) { } static inline void printk_nmi_direct_exit(void) { } #endif /* PRINTK_NMI */ +struct dev_printk_info; + #ifdef CONFIG_PRINTK -asmlinkage __printf(5, 0) +asmlinkage __printf(4, 0) int vprintk_emit(int facility, int level, - const char *dict, size_t dictlen, + const struct dev_printk_info *dev_info, const char *fmt, va_list args); asmlinkage __printf(1, 0) |