Commit 4215fa2d authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'fixes' into next 

Merge in our fixes branch, which brings in clone3() as well as some
implicit fallthrough fixes we want in next.
parents 2b87a255 b9ee5e04

arch/powerpc/include/asm/cache.h

+4 −4
Original line number Diff line number Diff line
@@ -107,22 +107,22 @@ extern void _set_L3CR(unsigned long); 


static inline void dcbz(void *addr)

{

	__asm__ __volatile__ ("dcbz %y0" : : "Z"(*(u8 *)addr) : "memory");

	__asm__ __volatile__ ("dcbz 0, %0" : : "r"(addr) : "memory");

}



static inline void dcbi(void *addr)

{

	__asm__ __volatile__ ("dcbi %y0" : : "Z"(*(u8 *)addr) : "memory");

	__asm__ __volatile__ ("dcbi 0, %0" : : "r"(addr) : "memory");

}



static inline void dcbf(void *addr)

{

	__asm__ __volatile__ ("dcbf %y0" : : "Z"(*(u8 *)addr) : "memory");

	__asm__ __volatile__ ("dcbf 0, %0" : : "r"(addr) : "memory");

}



static inline void dcbst(void *addr)

{

	__asm__ __volatile__ ("dcbst %y0" : : "Z"(*(u8 *)addr) : "memory");

	__asm__ __volatile__ ("dcbst 0, %0" : : "r"(addr) : "memory");

}

#endif /* !__ASSEMBLY__ */

#endif /* __KERNEL__ */

arch/powerpc/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#define __ARCH_WANT_SYS_FORK

#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_CLONE

#define __ARCH_WANT_SYS_CLONE3



#endif		/* __ASSEMBLY__ */

#endif /* _ASM_POWERPC_UNISTD_H_ */

arch/powerpc/kernel/align.c

+4 −0
Original line number Diff line number Diff line
@@ -176,9 +176,11 @@ static int emulate_spe(struct pt_regs *regs, unsigned int reg, 
			ret |= __get_user_inatomic(temp.v[1], p++);

			ret |= __get_user_inatomic(temp.v[2], p++);

			ret |= __get_user_inatomic(temp.v[3], p++);

			/* fall through */

		case 4:

			ret |= __get_user_inatomic(temp.v[4], p++);

			ret |= __get_user_inatomic(temp.v[5], p++);

			/* fall through */

		case 2:

			ret |= __get_user_inatomic(temp.v[6], p++);

			ret |= __get_user_inatomic(temp.v[7], p++);
@@ -259,9 +261,11 @@ static int emulate_spe(struct pt_regs *regs, unsigned int reg, 
			ret |= __put_user_inatomic(data.v[1], p++);

			ret |= __put_user_inatomic(data.v[2], p++);

			ret |= __put_user_inatomic(data.v[3], p++);

			/* fall through */

		case 4:

			ret |= __put_user_inatomic(data.v[4], p++);

			ret |= __put_user_inatomic(data.v[5], p++);

			/* fall through */

		case 2:

			ret |= __put_user_inatomic(data.v[6], p++);

			ret |= __put_user_inatomic(data.v[7], p++);

arch/powerpc/kernel/entry_32.S

+8 −0
Original line number Diff line number Diff line
@@ -597,6 +597,14 @@ ppc_clone: 
	stw	r0,_TRAP(r1)		/* register set saved */

	b	sys_clone



	.globl	ppc_clone3

ppc_clone3:

	SAVE_NVGPRS(r1)

	lwz	r0,_TRAP(r1)

	rlwinm	r0,r0,0,0,30		/* clear LSB to indicate full */

	stw	r0,_TRAP(r1)		/* register set saved */

	b	sys_clone3



	.globl	ppc_swapcontext

ppc_swapcontext:

	SAVE_NVGPRS(r1)

arch/powerpc/kernel/entry_64.S

+5 −0
Original line number Diff line number Diff line
@@ -487,6 +487,11 @@ _GLOBAL(ppc_clone) 
	bl	sys_clone

	b	.Lsyscall_exit



_GLOBAL(ppc_clone3)

       bl      save_nvgprs

       bl      sys_clone3

       b       .Lsyscall_exit



_GLOBAL(ppc32_swapcontext)

	bl	save_nvgprs

	bl	compat_sys_swapcontext