diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-01-18 09:56:14 +0300 |
|---|---|---|
| committer | Gabriel Krisman Bertazi <krisman@collabora.com> | 2022-01-21 03:57:24 +0300 |
| commit | 5298d4bfe80f6ae6ae2777bcd1357b0022d98573 (patch) | |
| tree | 60ea007ad0db7e699df97f5d38b66ef811a65b0c /include/linux | |
| parent | 6661224e66f03706daea8e27714436851cf01731 (diff) | |
| download | linux-5298d4bfe80f6ae6ae2777bcd1357b0022d98573.tar.xz | |
unicode: clean up the Kconfig symbol confusion
Turn the CONFIG_UNICODE symbol into a tristate that generates some always
built in code and remove the confusing CONFIG_UNICODE_UTF8_DATA symbol.
Note that a lot of the IS_ENABLED() checks could be turned from cpp
statements into normal ifs, but this change is intended to be fairly
mechanic, so that should be cleaned up later.
Fixes: 2b3d04787012 ("unicode: Add utf8-data module")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index c8510da6cc6d..fdac22d16c2b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1490,7 +1490,7 @@ struct super_block { #ifdef CONFIG_FS_VERITY const struct fsverity_operations *s_vop; #endif -#ifdef CONFIG_UNICODE +#if IS_ENABLED(CONFIG_UNICODE) struct unicode_map *s_encoding; __u16 s_encoding_flags; #endif |