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

Commit 1904148a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Two regression fixes, and a new syscall wire-up:

   - A fix for the recent conversion to time64_t in the powermac RTC
     routines, which caused time to go backward.

   - Another fix for fallout from the split PMD PTL conversion.

   - Wire up the new io_pgetevents() syscall.

  Thanks to: Aneesh Kumar K.V, Arnd Bergmann, Breno Leitao, Mathieu
  Malaterre"

* tag 'powerpc-4.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/powermac: Fix rtc read/write functions
  powerpc/mm/32: Fix pgtable_page_dtor call
  powerpc: Wire up io_pgetevents
parents 0d55ec6f 22db552b

arch/powerpc/include/asm/book3s/32/pgalloc.h

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ static inline void pgtable_free_tlb(struct mmu_gather *tlb, 
static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,

				  unsigned long address)

{

	pgtable_page_dtor(table);

	pgtable_free_tlb(tlb, page_address(table), 0);

}

#endif /* _ASM_POWERPC_BOOK3S_32_PGALLOC_H */

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

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table, 
				  unsigned long address)

{

	tlb_flush_pgtable(tlb, address);

	pgtable_page_dtor(table);

	pgtable_free_tlb(tlb, page_address(table), 0);

}

#endif /* _ASM_POWERPC_PGALLOC_32_H */

arch/powerpc/include/asm/systbl.h

+1 −0
Original line number Diff line number Diff line
@@ -393,3 +393,4 @@ SYSCALL(pkey_alloc) 
SYSCALL(pkey_free)

SYSCALL(pkey_mprotect)

SYSCALL(rseq)

COMPAT_SYS(io_pgetevents)

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		388

#define NR_syscalls		389



#define __NR__exit __NR_exit

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

+1 −0
Original line number Diff line number Diff line
@@ -399,5 +399,6 @@ 
#define __NR_pkey_free		385

#define __NR_pkey_mprotect	386

#define __NR_rseq		387

#define __NR_io_pgetevents	388



#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */