Skip to content

Commit

Permalink
Merge tag 'unicode-next-6.11' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/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
  • Loading branch information
torvalds committed Jul 28, 2024
2 parents 5437f30 + 6831890 commit 7b5d481
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions fs/unicode/mkutf8data.c
Original file line number Diff line number Diff line change
Expand Up @@ -3352,6 +3352,7 @@ static void write_file(void)
fprintf(file, "};\n");
fprintf(file, "EXPORT_SYMBOL_GPL(utf8_data_table);");
fprintf(file, "\n");
fprintf(file, "MODULE_DESCRIPTION(\"UTF8 data table\");\n");
fprintf(file, "MODULE_LICENSE(\"GPL v2\");\n");
fclose(file);
}
Expand Down
5 changes: 3 additions & 2 deletions fs/unicode/utf8-selftest.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#include "utf8n.h"

unsigned int failed_tests;
unsigned int total_tests;
static unsigned int failed_tests;
static unsigned int total_tests;

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

MODULE_AUTHOR("Gabriel Krisman Bertazi <[email protected]>");
MODULE_DESCRIPTION("Kernel module for testing utf-8 support");
MODULE_LICENSE("GPL");
1 change: 1 addition & 0 deletions fs/unicode/utf8data.c_shipped
Original file line number Diff line number Diff line change
Expand Up @@ -4120,4 +4120,5 @@ struct utf8data_table utf8_data_table = {
.utf8data = utf8data,
};
EXPORT_SYMBOL_GPL(utf8_data_table);
MODULE_DESCRIPTION("UTF8 data table");
MODULE_LICENSE("GPL v2");

0 comments on commit 7b5d481

Please sign in to comment.