Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec1cc55d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 - Wire up copy_file_range() syscall from Chandan Rajendra
 - Simplify module TOC handling from Alan Modra
 - Remove newly added extra definition of pmd_dirty from Stephen Rothwell
 - Allow user space to map rtas_rmo_buf from Vasant Hegde
 - Fix PE location code from Gavin Shan
 - Remove PPMU_HAS_SSLOT flag for Power8 from Madhavan Srinivasan
 - Fixup _HPAGE_CHG_MASK from Aneesh Kumar K.V

* tag 'powerpc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/mm: Fixup _HPAGE_CHG_MASK
  powerpc/perf: Remove PPMU_HAS_SSLOT flag for Power8
  powerpc/eeh: Fix PE location code
  powerpc/mm: Allow user space to map rtas_rmo_buf
  powerpc: Remove newly added extra definition of pmd_dirty
  powerpc: Simplify module TOC handling
  powerpc: Wire up copy_file_range() syscall
parents 6b292a8a 2d19fc63

arch/powerpc/include/asm/book3s/64/hash.h

+3 −1
Original line number Diff line number Diff line
@@ -50,7 +50,9 @@ 
 * set of bits not changed in pmd_modify.

 */

#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \

			 _PAGE_ACCESSED | _PAGE_THP_HUGE)

			 _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE | \

			 _PAGE_SOFT_DIRTY)





#ifdef CONFIG_PPC_64K_PAGES

#include <asm/book3s/64/hash-64k.h>

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

+0 −1
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ static inline pte_t *pmdp_ptep(pmd_t *pmd) 
#define pmd_pfn(pmd)		pte_pfn(pmd_pte(pmd))

#define pmd_dirty(pmd)		pte_dirty(pmd_pte(pmd))

#define pmd_young(pmd)		pte_young(pmd_pte(pmd))

#define pmd_dirty(pmd)		pte_dirty(pmd_pte(pmd))

#define pmd_mkold(pmd)		pte_pmd(pte_mkold(pmd_pte(pmd)))

#define pmd_wrprotect(pmd)	pte_pmd(pte_wrprotect(pmd_pte(pmd)))

#define pmd_mkdirty(pmd)	pte_pmd(pte_mkdirty(pmd_pte(pmd)))

arch/powerpc/include/asm/systbl.h

+1 −0
Original line number Diff line number Diff line
@@ -383,3 +383,4 @@ SYSCALL(ni_syscall) 
SYSCALL(ni_syscall)

SYSCALL(ni_syscall)

SYSCALL(mlock2)

SYSCALL(copy_file_range)

arch/powerpc/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <uapi/asm/unistd.h>





#define NR_syscalls		379

#define NR_syscalls		380



#define __NR__exit __NR_exit

arch/powerpc/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -389,5 +389,6 @@ 
#define __NR_userfaultfd	364

#define __NR_membarrier		365

#define __NR_mlock2		378

#define __NR_copy_file_range	379



#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */