Importing "grsecurity-3.1-3.19.2-201503201903.patch"

[people/ms/linux.git] / include / linux / nls.h

diff --git a/include/linux/nls.h b/include/linux/nls.h
index 520681b6820817b6f08cb304503bf75b8f8f564f..2b7fabb9944b534280f065fa85601265c606f02f 100644 (file)
--- a/include/linux/nls.h
+++ b/include/linux/nls.h
@@ -31,7 +31,7 @@ struct nls_table {
        const unsigned char *charset2upper;
        struct module *owner;
        struct nls_table *next;
-};
+} __do_const;
 
 /* this value hold the maximum octet of charset */
 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
@@ -46,7 +46,7 @@ enum utf16_endian {
 /* nls_base.c */
 extern int __register_nls(struct nls_table *, struct module *);
 extern int unregister_nls(struct nls_table *);
-extern struct nls_table *load_nls(char *);
+extern struct nls_table *load_nls(const char *);
 extern void unload_nls(struct nls_table *);
 extern struct nls_table *load_nls_default(void);
 #define register_nls(nls) __register_nls((nls), THIS_MODULE)