Merge branch 'fixes' into next (637cfeb9) · Commits · 戴 / test

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

+9 −17

Original line number	Diff line number	Diff line
		@@ -904,7 +904,7 @@ static inline int pud_none(pud_t pud)

		static inline int pud_present(pud_t pud)
		{
		return (pud_raw(pud) & cpu_to_be64(_PAGE_PRESENT));
		return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PRESENT));
		}

		extern struct page *pud_page(pud_t pud);
		@@ -951,7 +951,7 @@ static inline int pgd_none(pgd_t pgd)

		static inline int pgd_present(pgd_t pgd)
		{
		return (pgd_raw(pgd) & cpu_to_be64(_PAGE_PRESENT));
		return !!(pgd_raw(pgd) & cpu_to_be64(_PAGE_PRESENT));
		}

		static inline pte_t pgd_pte(pgd_t pgd)
		@@ -1258,21 +1258,13 @@ extern pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,

		#define pmd_move_must_withdraw pmd_move_must_withdraw
		struct spinlock;
		static inline int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl,
		extern int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl,
		struct spinlock *old_pmd_ptl,
		struct vm_area_struct *vma)
		{
		if (radix_enabled())
		return false;
		struct vm_area_struct *vma);
		/*
		* Archs like ppc64 use pgtable to store per pmd
		* specific information. So when we switch the pmd,
		* we should also withdraw and deposit the pgtable
		* Hash translation mode use the deposited table to store hash pte
		* slot information.
		*/
		return true;
		}


		#define arch_needs_pgtable_deposit arch_needs_pgtable_deposit
		static inline bool arch_needs_pgtable_deposit(void)
		{

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ enum perf_event_powerpc_regs {
		PERF_REG_POWERPC_DAR,
		PERF_REG_POWERPC_DSISR,
		PERF_REG_POWERPC_SIER,
		PERF_REG_POWERPC_MMCRA,
		PERF_REG_POWERPC_MAX,
		};
		#endif /* _UAPI_ASM_POWERPC_PERF_REGS_H */

+2 −1

Original line number	Diff line number	Diff line
		@@ -852,11 +852,12 @@ start_here:

		/* set up the PTE pointers for the Abatron bdiGDB.
		*/
		tovirt(r6,r6)
		lis r5, abatron_pteptrs@h
		ori r5, r5, abatron_pteptrs@l
		stw r5, 0xf0(0) /* Must match your Abatron config file */
		tophys(r5,r5)
		lis r6, swapper_pg_dir@h
		ori r6, r6, swapper_pg_dir@l
		stw r6, 0(r5)

		/* Now turn on the MMU for real! */

+4 −3

Original line number	Diff line number	Diff line
		@@ -755,11 +755,12 @@ SYSCALL_DEFINE0(rt_sigreturn)
		if (restore_tm_sigcontexts(current, &uc->uc_mcontext,
		&uc_transact->uc_mcontext))
		goto badframe;
		}
		} else
		#endif
		/* Fall through, for non-TM restore */
		if (!MSR_TM_ACTIVE(msr)) {
		{
		/*
		* Fall through, for non-TM restore
		*
		* Unset MSR[TS] on the thread regs since MSR from user
		* context does not have MSR active, and recheckpoint was
		* not called since restore_tm_sigcontexts() was not called

+0 −7

Original line number	Diff line number	Diff line
		@@ -967,13 +967,6 @@ out:
		}
		#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

		#if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_PPC64)
		unsigned long __init arch_syscall_addr(int nr)
		{
		return sys_call_table[nr*2];
		}
		#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_PPC64 */

		#ifdef PPC64_ELF_ABI_v1
		char arch_ftrace_match_adjust(char str, const char *search)
		{