From: Nick Xie <nick@khadas.com>
Date: Wed, 27 May 2020 10:46:54 +0000 (+0800)
Subject: fix build errors
X-Git-Tag: khadas-vims-v0.9.6-release~59
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d1b9c38958fea3eebc86bec6a7e9eaf3f3a8780;p=platform%2Fkernel%2Flinux-amlogic.git

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 630e04314545..a10170b6c3a0 100644
--- 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 197964e6a287..c5b000885799 100644
--- 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
 };