summaryrefslogtreecommitdiff
path: root/include/linux/string.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2024-12-02 11:52:59 +0100
committerIngo Molnar <mingo@kernel.org>2024-12-02 11:52:59 +0100
commitbcfd5f644c5b933cfb3c488220e40a03e011e8a4 (patch)
tree66717ce2352b3e9a14b94ffe804db93b073eb525 /include/linux/string.h
parentfaac6f105ef169e2e5678c14e1ffebf2a7d780b6 (diff)
parent40384c840ea1944d7c5a392e8975ed088ecf0b37 (diff)
Merge tag 'v6.13-rc1' into perf/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/string.h')
-rw-r--r--include/linux/string.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/string.h b/include/linux/string.h
index 0dd27afcfaf7..493ac4862c77 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -335,7 +335,6 @@ int __sysfs_match_string(const char * const *array, size_t n, const char *s);
#ifdef CONFIG_BINARY_PRINTF
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);
-int bprintf(u32 *bin_buf, size_t size, const char *fmt, ...) __printf(3, 4);
#endif
extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,