Commit 7b5d4818 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5437f30d 68318904

fs/unicode/mkutf8data.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}

fs/unicode/utf8-selftest.c

+3 −2
Original line number Diff line number Diff line
@@ -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)
@@ -307,4 +307,5 @@ module_init(init_test_ucd); 
module_exit(exit_test_ucd);



MODULE_AUTHOR("Gabriel Krisman Bertazi <krisman@collabora.co.uk>");

MODULE_DESCRIPTION("Kernel module for testing utf-8 support");

MODULE_LICENSE("GPL");

fs/unicode/utf8data.c_shipped

+1 −0
Original line number Diff line number Diff line
@@ -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");