diff options
| author | Petr Mladek <pmladek@suse.com> | 2026-02-11 10:14:35 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2026-02-11 10:14:35 +0100 |
| commit | 9abbecf408cba09d73d14f044e1bc12ab7776da0 (patch) | |
| tree | 64c2eb801cbbb6a1c83d52e5fb5d568797a4536d /include | |
| parent | 7a2c1b27cd6b853e924bb0bbcb01eb64fbb97875 (diff) | |
| parent | b07829d546c83134629591f02c5348d57cea0c1e (diff) | |
Merge branch 'for-6.20' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/seq_file.h | 1 | ||||
| -rw-r--r-- | include/linux/string.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h index d6ebf0596510..2fb266ea69fa 100644 --- a/include/linux/seq_file.h +++ b/include/linux/seq_file.h @@ -181,7 +181,6 @@ int seq_open_private(struct file *, const struct seq_operations *, int); int seq_release_private(struct inode *, struct file *); #ifdef CONFIG_BINARY_PRINTF -__printf(2, 0) void seq_bprintf(struct seq_file *m, const char *f, const u32 *binary); #endif diff --git a/include/linux/string.h b/include/linux/string.h index 1b564c36d721..b850bd91b3d8 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -336,8 +336,8 @@ int __sysfs_match_string(const char * const *array, size_t n, const char *s); #define sysfs_match_string(_a, _s) __sysfs_match_string(_a, ARRAY_SIZE(_a), _s) #ifdef CONFIG_BINARY_PRINTF -__printf(3, 0) int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args); -__printf(3, 0) int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf); +int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args); +int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf); #endif extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos, |