fix build errors

Signed-off-by: Nick Xie <nick@khadas.com>

diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 630e043145450873844d89a599d4b33cba7fd28d..a10170b6c3a06f6a8fa05f81dbf6f69e7ee41057 100644 (file)
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -506,8 +506,6 @@ static void __init map_kernel(pgd_t *pgd)
                 * entry instead.
                 */
                BUG_ON(!IS_ENABLED(CONFIG_ARM64_16K_PAGES));
-               set_pud(pud_set_fixmap_offset(pgd, FIXADDR_START),
-                       __pud(__pa_symbol(bm_pmd) | PUD_TYPE_TABLE));
                pud_populate(&init_mm, pud_set_fixmap_offset(pgd, FIXADDR_START),
                             lm_alias(bm_pmd));
                pud_clear_fixmap();

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 197964e6a287fd39ef9368dab2eef8d12862a525..c5b000885799b1e4a593cc6504e408d976d52664 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1519,7 +1519,7 @@ struct ext4_sb_info {
 
        /* Encryption support */
 #ifdef CONFIG_EXT4_FS_ENCRYPTION
-       u8 key_prefix[EXT4_KEY_DESC_PREFIX_SIZE];
+       u8 key_prefix[FS_KEY_DESC_PREFIX_SIZE];
        u8 key_prefix_size;
 #endif
 };