Skip to content

Commit 7b5d481

Browse files
committed
Merge tag 'unicode-next-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode
Pull unicode update from Gabriel Krisman Bertazi: "Two small fixes to silence the compiler and static analyzers tools from Ben Dooks and Jeff Johnson" * tag 'unicode-next-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode: unicode: add MODULE_DESCRIPTION() macros unicode: make utf8 test count static
2 parents 5437f30 + 6831890 commit 7b5d481

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

fs/unicode/mkutf8data.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3352,6 +3352,7 @@ static void write_file(void)
33523352
fprintf(file, "};\n");
33533353
fprintf(file, "EXPORT_SYMBOL_GPL(utf8_data_table);");
33543354
fprintf(file, "\n");
3355+
fprintf(file, "MODULE_DESCRIPTION(\"UTF8 data table\");\n");
33553356
fprintf(file, "MODULE_LICENSE(\"GPL v2\");\n");
33563357
fclose(file);
33573358
}

fs/unicode/utf8-selftest.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#include "utf8n.h"
1616

17-
unsigned int failed_tests;
18-
unsigned int total_tests;
17+
static unsigned int failed_tests;
18+
static unsigned int total_tests;
1919

2020
/* Tests will be based on this version. */
2121
#define UTF8_LATEST UNICODE_AGE(12, 1, 0)
@@ -307,4 +307,5 @@ module_init(init_test_ucd);
307307
module_exit(exit_test_ucd);
308308

309309
MODULE_AUTHOR("Gabriel Krisman Bertazi <krisman@collabora.co.uk>");
310+
MODULE_DESCRIPTION("Kernel module for testing utf-8 support");
310311
MODULE_LICENSE("GPL");

fs/unicode/utf8data.c_shipped

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4120,4 +4120,5 @@ struct utf8data_table utf8_data_table = {
41204120
.utf8data = utf8data,
41214121
};
41224122
EXPORT_SYMBOL_GPL(utf8_data_table);
4123+
MODULE_DESCRIPTION("UTF8 data table");
41234124
MODULE_LICENSE("GPL v2");

0 commit comments

Comments
 (0)