summaryrefslogtreecommitdiff
path: root/arch/arc/include/asm/pgtable-bits-arcv2.h
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2025-07-15 18:34:10 +0300
committerChen-Yu Tsai <wens@csie.org>2025-07-15 18:34:10 +0300
commitca5ad734d30f30a577f705926d6e16a87513a2a7 (patch)
treeb5fb169a86ac59892bd3b60c2df13e8a7cef360d /arch/arc/include/asm/pgtable-bits-arcv2.h
parent082c6a2d06c0831d236760a29953355845eee988 (diff)
parentf99d4fccd2185176baf4ecac9a49d280fc62b953 (diff)
downloadlinux-ca5ad734d30f30a577f705926d6e16a87513a2a7.tar.xz
Merge branch 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm into sunxi/dt-for-6.17
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Diffstat (limited to 'arch/arc/include/asm/pgtable-bits-arcv2.h')
-rw-r--r--arch/arc/include/asm/pgtable-bits-arcv2.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arc/include/asm/pgtable-bits-arcv2.h b/arch/arc/include/asm/pgtable-bits-arcv2.h
index 8ebec1b21d24..4630c5acca05 100644
--- a/arch/arc/include/asm/pgtable-bits-arcv2.h
+++ b/arch/arc/include/asm/pgtable-bits-arcv2.h
@@ -75,7 +75,7 @@
* This is to enable COW mechanism
*/
/* xwr */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define pte_write(pte) (pte_val(pte) & _PAGE_WRITE)
#define pte_dirty(pte) (pte_val(pte) & _PAGE_DIRTY)
@@ -130,7 +130,7 @@ void update_mmu_cache_range(struct vm_fault *vmf, struct vm_area_struct *vma,
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
#define __swp_entry_to_pte(x) ((pte_t) { (x).val })
-static inline int pte_swp_exclusive(pte_t pte)
+static inline bool pte_swp_exclusive(pte_t pte)
{
return pte_val(pte) & _PAGE_SWP_EXCLUSIVE;
}
@@ -142,6 +142,6 @@ PTE_BIT_FUNC(swp_clear_exclusive, &= ~(_PAGE_SWP_EXCLUSIVE));
#include <asm/hugepage.h>
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif