From: "Mike Rapoport (Microsoft)" <[email protected]>
Kernel compilation on csky fails because csky was not updated during
conversion of folio flags to memdesc_flags_t:
arch/csky/abiv2/inc/abi/cacheflush.h: In function 'flush_dcache_folio':
arch/csky/abiv2/inc/abi/cacheflush.h:23:39: error: passing argument 2 of
'const_test_bit' from incompatible pointer type
[-Werror=incompatible-pointer-types]
23 | if (test_bit(PG_dcache_clean, &folio->flags))
| ^~~~~~~~~~~~~
| |
| memdesc_flags_t *
include/linux/bitops.h:47:24: note: in definition of macro 'bitop'
47 | const##op(nr, addr) : op(nr, addr))
| ^~~~
arch/csky/abiv2/inc/abi/cacheflush.h:23:13: note: in expansion of macro
'test_bit'
23 | if (test_bit(PG_dcache_clean, &folio->flags))
| ^~~~~~~~
Update references of folio->flags in arch/csky.
Fixes: 53fbef56e07d ("mm: introduce memdesc_flags_t")
Signed-off-by: Mike Rapoport (Microsoft) <[email protected]>
---
arch/csky/abiv2/cacheflush.c | 2 +-
arch/csky/abiv2/inc/abi/cacheflush.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/csky/abiv2/cacheflush.c b/arch/csky/abiv2/cacheflush.c
index 876028b1083f..064b0f0f95ca 100644
--- a/arch/csky/abiv2/cacheflush.c
+++ b/arch/csky/abiv2/cacheflush.c
@@ -21,7 +21,7 @@ void update_mmu_cache_range(struct vm_fault *vmf, struct
vm_area_struct *vma,
folio = page_folio(pfn_to_page(pfn));
- if (test_and_set_bit(PG_dcache_clean, &folio->flags))
+ if (test_and_set_bit(PG_dcache_clean, &folio->flags.f))
return;
icache_inv_range(address, address + nr*PAGE_SIZE);
diff --git a/arch/csky/abiv2/inc/abi/cacheflush.h
b/arch/csky/abiv2/inc/abi/cacheflush.h
index 6513ac5d2578..da51a0f02391 100644
--- a/arch/csky/abiv2/inc/abi/cacheflush.h
+++ b/arch/csky/abiv2/inc/abi/cacheflush.h
@@ -20,8 +20,8 @@
static inline void flush_dcache_folio(struct folio *folio)
{
- if (test_bit(PG_dcache_clean, &folio->flags))
- clear_bit(PG_dcache_clean, &folio->flags);
+ if (test_bit(PG_dcache_clean, &folio->flags.f))
+ clear_bit(PG_dcache_clean, &folio->flags.f);
}
#define flush_dcache_folio flush_dcache_folio
base-commit: 3a8660878839faadb4f1a6dd72c3179c1df56787
--
2.50.1
