Skip to content

Commit 4a71df1

Browse files
Avenger-285714chenhuacai
authored andcommitted
LoongArch: Use __pmd()/__pte() for swap entry conversions
The __pmd() and __pte() helper macros provide the correct initialization syntax and abstraction for the pmd_t and pte_t types. Use __pmd() to fix follow warning about __swp_entry_to_pmd() with gcc-15 under specific configs [1] : In file included from ./include/linux/pgtable.h:6, from ./include/linux/mm.h:31, from ./include/linux/pagemap.h:8, from arch/loongarch/mm/init.c:14: ./include/linux/swapops.h: In function ‘swp_entry_to_pmd’: ./arch/loongarch/include/asm/pgtable.h:302:34: error: missing braces around initializer [-Werror=missing-braces] 302 | #define __swp_entry_to_pmd(x) ((pmd_t) { (x).val | _PAGE_HUGE }) | ^ ./include/linux/swapops.h:559:16: note: in expansion of macro ‘__swp_entry_to_pmd’ 559 | return __swp_entry_to_pmd(arch_entry); | ^~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Also update __swp_entry_to_pte() to use __pte() for consistency. [1]. https://download.01.org/0day-ci/archive/20251119/202511190316.luI90kAo-lkp@intel.com/config Cc: stable@vger.kernel.org Signed-off-by: Yuli Wang <wangyl5933@chinaunicom.cn> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
1 parent a91b446 commit 4a71df1

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/loongarch/include/asm/pgtable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,9 @@ static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
297297
#define __swp_offset(x) ((x).val >> 24)
298298
#define __swp_entry(type, offset) ((swp_entry_t) { pte_val(mk_swap_pte((type), (offset))) })
299299
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
300-
#define __swp_entry_to_pte(x) ((pte_t) { (x).val })
300+
#define __swp_entry_to_pte(x) __pte((x).val)
301301
#define __pmd_to_swp_entry(pmd) ((swp_entry_t) { pmd_val(pmd) })
302-
#define __swp_entry_to_pmd(x) ((pmd_t) { (x).val | _PAGE_HUGE })
302+
#define __swp_entry_to_pmd(x) __pmd((x).val | _PAGE_HUGE)
303303

304304
static inline bool pte_swp_exclusive(pte_t pte)
305305
{

0 commit comments

Comments
 (0)