Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (04cde035) · Commits · e / devices / android_kernel_xiaomi_markw

arch/powerpc/include/asm/hvcall.h

+22 −0

Original line number	Original line	Diff line number	Diff line
	@@ -291,6 +291,28 @@ struct hvcall_mpp_data {
	};		};

	int h_get_mpp(struct hvcall_mpp_data *);		int h_get_mpp(struct hvcall_mpp_data *);

			#ifdef CONFIG_PPC_PSERIES
			extern int CMO_PrPSP;
			extern int CMO_SecPSP;
			extern unsigned long CMO_PageSize;

			static inline int cmo_get_primary_psp(void)
			{
			return CMO_PrPSP;
			}

			static inline int cmo_get_secondary_psp(void)
			{
			return CMO_SecPSP;
			}

			static inline unsigned long cmo_get_page_size(void)
			{
			return CMO_PageSize;
			}
			#endif /* CONFIG_PPC_PSERIES */

	#endif /* __ASSEMBLY__ */		#endif /* __ASSEMBLY__ */
	#endif /* __KERNEL__ */		#endif /* __KERNEL__ */
	#endif /* _ASM_POWERPC_HVCALL_H */		#endif /* _ASM_POWERPC_HVCALL_H */

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,8 @@
	li en,1;		li en,1;
	#define TRACE_AND_RESTORE_IRQ(en) \		#define TRACE_AND_RESTORE_IRQ(en) \
	TRACE_AND_RESTORE_IRQ_PARTIAL(en,96f); \		TRACE_AND_RESTORE_IRQ_PARTIAL(en,96f); \
	96: stb en,PACASOFTIRQEN(r13)		stb en,PACASOFTIRQEN(r13); \
			96:
	#else		#else
	#define TRACE_ENABLE_INTS		#define TRACE_ENABLE_INTS
	#define TRACE_DISABLE_INTS		#define TRACE_DISABLE_INTS

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -147,7 +147,6 @@ static inline void get_mmu_context(struct mm_struct *mm)
	static inline int init_new_context(struct task_struct t, struct mm_struct mm)		static inline int init_new_context(struct task_struct t, struct mm_struct mm)
	{		{
	mm->context.id = NO_CONTEXT;		mm->context.id = NO_CONTEXT;
	mm->context.vdso_base = 0;
	return 0;		return 0;
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -92,7 +92,7 @@ COMPAT_SYS_SPU(readlink)
	SYSCALL(uselib)		SYSCALL(uselib)
	SYSCALL(swapon)		SYSCALL(swapon)
	SYSCALL(reboot)		SYSCALL(reboot)
	SYSX(sys_ni_syscall,old32_readdir,old_readdir)		SYSX(sys_ni_syscall,compat_sys_old_readdir,old_readdir)
	SYSCALL_SPU(mmap)		SYSCALL_SPU(mmap)
	SYSCALL_SPU(munmap)		SYSCALL_SPU(munmap)
	SYSCALL_SPU(truncate)		SYSCALL_SPU(truncate)

+1 −1