@@ -2858,7 +2858,7 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)
28582858 return ptlock_ptr (page_ptdesc (pmd_page (* pmd )));
28592859}
28602860
2861- static inline bool ptlock_init (struct page * page )
2861+ static inline bool ptlock_init (struct ptdesc * ptdesc )
28622862{
28632863 /*
28642864 * prep_new_page() initialize page->private (and therefore page->ptl)
@@ -2867,10 +2867,10 @@ static inline bool ptlock_init(struct page *page)
28672867 * It can happen if arch try to use slab for page table allocation:
28682868 * slab code uses page->slab_cache, which share storage with page->ptl.
28692869 */
2870- VM_BUG_ON_PAGE (* (unsigned long * )& page -> ptl , page );
2871- if (!ptlock_alloc (page_ptdesc ( page ) ))
2870+ VM_BUG_ON_PAGE (* (unsigned long * )& ptdesc -> ptl , ptdesc_page ( ptdesc ) );
2871+ if (!ptlock_alloc (ptdesc ))
28722872 return false;
2873- spin_lock_init (ptlock_ptr (page_ptdesc ( page ) ));
2873+ spin_lock_init (ptlock_ptr (ptdesc ));
28742874 return true;
28752875}
28762876
@@ -2883,13 +2883,13 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)
28832883 return & mm -> page_table_lock ;
28842884}
28852885static inline void ptlock_cache_init (void ) {}
2886- static inline bool ptlock_init (struct page * page ) { return true; }
2886+ static inline bool ptlock_init (struct ptdesc * ptdesc ) { return true; }
28872887static inline void ptlock_free (struct page * page ) {}
28882888#endif /* USE_SPLIT_PTE_PTLOCKS */
28892889
28902890static inline bool pgtable_pte_page_ctor (struct page * page )
28912891{
2892- if (!ptlock_init (page ))
2892+ if (!ptlock_init (page_ptdesc ( page ) ))
28932893 return false;
28942894 __SetPageTable (page );
28952895 inc_lruvec_page_state (page , NR_PAGETABLE );
@@ -2964,7 +2964,7 @@ static inline bool pmd_ptlock_init(struct ptdesc *ptdesc)
29642964#ifdef CONFIG_TRANSPARENT_HUGEPAGE
29652965 ptdesc -> pmd_huge_pte = NULL ;
29662966#endif
2967- return ptlock_init (ptdesc_page ( ptdesc ) );
2967+ return ptlock_init (ptdesc );
29682968}
29692969
29702970static inline void pmd_ptlock_free (struct page * page )
0 commit comments