Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-6.20' into for-linus
+18
-14
-1
include/linux/seq_file.h
-1
include/linux/seq_file.h
+2
-2
include/linux/string.h
+2
-2
include/linux/string.h
···
336
336
#define sysfs_match_string(_a, _s) __sysfs_match_string(_a, ARRAY_SIZE(_a), _s)
337
337
338
338
#ifdef CONFIG_BINARY_PRINTF
339
-
__printf(3, 0) int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args);
340
-
__printf(3, 0) int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf);
339
+
int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args);
340
+
int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf);
341
341
#endif
342
342
343
343
extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,
+5
-2
kernel/printk/nbcon.c
+5
-2
kernel/printk/nbcon.c
···
1758
1758
/* Synchronize the kthread start. */
1759
1759
lockdep_assert_console_list_lock_held();
1760
1760
1761
-
/* The write_thread() callback is mandatory. */
1762
-
if (WARN_ON(!con->write_thread))
1761
+
/* Check for mandatory nbcon callbacks. */
1762
+
if (WARN_ON(!con->write_thread ||
1763
+
!con->device_lock ||
1764
+
!con->device_unlock)) {
1763
1765
return false;
1766
+
}
1764
1767
1765
1768
rcuwait_init(&con->rcuwait);
1766
1769
init_irq_work(&con->irq_work, nbcon_irq_work);
+11
-9
lib/tests/printf_kunit.c
+11
-9
lib/tests/printf_kunit.c
···
266
266
KUNIT_EXPECT_MEMNEQ(kunittest, buf, PTR_STR, PTR_WIDTH);
267
267
}
268
268
269
-
static void
270
-
test_hashed(struct kunit *kunittest, const char *fmt, const void *p)
271
-
{
272
-
char buf[PLAIN_BUF_SIZE];
273
-
274
-
plain_hash_to_buffer(kunittest, p, buf, PLAIN_BUF_SIZE);
275
-
276
-
test(buf, fmt, p);
277
-
}
269
+
/*
270
+
* This is a macro so that the compiler can compare its arguments to the
271
+
* __printf() attribute on __test(). This cannot be a function with a __printf()
272
+
* attribute because GCC requires __printf() functions to be variadic.
273
+
*/
274
+
#define test_hashed(kunittest, fmt, p) \
275
+
do { \
276
+
char buf[PLAIN_BUF_SIZE]; \
277
+
plain_hash_to_buffer(kunittest, p, buf, PLAIN_BUF_SIZE); \
278
+
test(buf, fmt, p); \
279
+
} while (0)
278
280
279
281
/*
280
282
* NULL pointers aren't hashed.