From: Wang Kefeng <wangkefeng.wang@huawei.com>
Date: Fri, 3 Dec 2021 09:21:42 +0000 (+0100)
Subject: ARM: 9161/1: mm: mark private VM_FAULT_X defines as vm_fault_t
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d0eae8287cf3dff6670e7e9910159942bda45a20;p=linux.git

ARM: 9161/1: mm: mark private VM_FAULT_X defines as vm_fault_t

This fixes several sparse warnings for fault.c:

arch/arm/mm/fault.c:210:24: sparse:     expected restricted vm_fault_t
arch/arm/mm/fault.c:210:24: sparse:     got int
...
arch/arm/mm/fault.c:345:24: sparse: sparse: restricted vm_fault_t degrades to integer

Reported-by: kernel test robot <lkp@intel.com>
Fixes: caed89dab0ca ("ARM: 9128/1: mm: Refactor the __do_page_fault()")
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---

diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index bc8779d54a640..013921a5909b0 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -191,8 +191,8 @@ void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
 }
 
 #ifdef CONFIG_MMU
-#define VM_FAULT_BADMAP		0x010000
-#define VM_FAULT_BADACCESS	0x020000
+#define VM_FAULT_BADMAP		((__force vm_fault_t)0x010000)
+#define VM_FAULT_BADACCESS	((__force vm_fault_t)0x020000)
 
 static inline bool is_permission_fault(unsigned int fsr)
 {