powerpc/nohash: Remove _PAGE_BUSY (0d594aa7) · Commits · 戴 / test

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

+3 −7

Original line number	Diff line number	Diff line
		@@ -186,14 +186,12 @@ static inline unsigned long pte_update(struct mm_struct *mm,

		__asm__ __volatile__(
		"1: ldarx %0,0,%3 # pte_update\n\
		andi. %1,%0,%6\n\
		bne- 1b \n\
		andc %1,%0,%4 \n\
		or %1,%1,%7\n\
		or %1,%1,%6\n\
		stdcx. %1,0,%3 \n\
		bne- 1b"
		: "=&r" (old), "=&r" (tmp), "=m" (*ptep)
		: "r" (ptep), "r" (clr), "m" (*ptep), "i" (_PAGE_BUSY), "r" (set)
		: "r" (ptep), "r" (clr), "m" (*ptep), "r" (set)
		: "cc" );
		#else
		unsigned long old = pte_val(*ptep);
		@@ -295,13 +293,11 @@ static inline void __ptep_set_access_flags(struct mm_struct *mm,

		__asm__ __volatile__(
		"1: ldarx %0,0,%4\n\
		andi. %1,%0,%6\n\
		bne- 1b \n\
		or %0,%3,%0\n\
		stdcx. %0,0,%4\n\
		bne- 1b"
		:"=&r" (old), "=&r" (tmp), "=m" (*ptep)
		:"r" (bits), "r" (ptep), "m" (*ptep), "i" (_PAGE_BUSY)
		:"r" (bits), "r" (ptep), "m" (*ptep)
		:"cc");
		#else
		unsigned long old = pte_val(*ptep);

+0 −5

Original line number	Diff line number	Diff line
		@@ -57,13 +57,8 @@
		#define _PAGE_USER (_PAGE_BAP_UR \| _PAGE_BAP_SR) /* Can be read */
		#define _PAGE_PRIVILEGED (_PAGE_BAP_SR)

		#define _PAGE_BUSY 0

		#define _PAGE_SPECIAL _PAGE_SW0

		/* Flags to be preserved on PTE modifications */
		#define _PAGE_HPTEFLAGS _PAGE_BUSY

		/* Base page size */
		#ifdef CONFIG_PPC_64K_PAGES
		#define _PAGE_PSIZE _PAGE_PSIZE_64K