Skip to content

Commit 2dff2c3

Browse files
Peter Zijlstrahansendc
authored andcommitted
mm: Convert __HAVE_ARCH_P..P_GET to the new style
Since __HAVE_ARCH_* style guards have been depricated in favour of defining the function name onto itself, convert pxxp_get(). Suggested-by: Linus Torvalds <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent eb780dc commit 2dff2c3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

arch/powerpc/include/asm/nohash/32/pgtable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p
263263
}
264264

265265
#ifdef CONFIG_PPC_16K_PAGES
266-
#define __HAVE_ARCH_PTEP_GET
266+
#define ptep_get ptep_get
267267
static inline pte_t ptep_get(pte_t *ptep)
268268
{
269269
pte_basic_t val = READ_ONCE(ptep->pte);

include/linux/pgtable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,14 @@ static inline void ptep_clear(struct mm_struct *mm, unsigned long addr,
291291
ptep_get_and_clear(mm, addr, ptep);
292292
}
293293

294-
#ifndef __HAVE_ARCH_PTEP_GET
294+
#ifndef ptep_get
295295
static inline pte_t ptep_get(pte_t *ptep)
296296
{
297297
return READ_ONCE(*ptep);
298298
}
299299
#endif
300300

301-
#ifndef __HAVE_ARCH_PMDP_GET
301+
#ifndef pmdp_get
302302
static inline pmd_t pmdp_get(pmd_t *pmdp)
303303
{
304304
return READ_ONCE(*pmdp);

0 commit comments

Comments
 (0)