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

Commit 9f225788 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc fixes from Ben Herrenschmidt:
 "Here are a few powerpc bits & fixes for rc1.  A couple of str*cpy
  fixes, some fixes in handling the FSCR register on Power8 (controls
  the enabling of processor features), a 32-bit build fix and a couple
  more nits."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Set DSCR bit in FSCR setup
  powerpc: Add DSCR FSCR register bit definition
  powerpc: Fix setting FSCR for HV=0 and on secondary CPUs
  powerpc: Wireup the kcmp syscall to sys_ni
  powerpc: Remove unused BITOP_LE_SWIZZLE macro
  powerpc: Avoid link stack corruption in MMU on syscall entry path
  drivers/tty/hvc: Use strlcpy instead of strncpy
  powerpc/pseries/hvcserver: Fix strncpy buffer limit in location code
  powerpc: Fix compile of sha1-powerpc-asm.S on 32-bit
parents d7b815d4 54c9b225

arch/powerpc/crypto/sha1-powerpc-asm.S

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ 
	STEPUP4((t)+16, fn)



_GLOBAL(powerpc_sha_transform)

	PPC_STLU r1,-STACKFRAMESIZE(r1)

	PPC_STLU r1,-INT_FRAME_SIZE(r1)

	SAVE_8GPRS(14, r1)

	SAVE_10GPRS(22, r1)
@@ -175,5 +175,5 @@ _GLOBAL(powerpc_sha_transform) 


	REST_8GPRS(14, r1)

	REST_10GPRS(22, r1)

	addi	r1,r1,STACKFRAMESIZE

	addi	r1,r1,INT_FRAME_SIZE

	blr

arch/powerpc/include/asm/bitops.h

+0 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ 
#define smp_mb__before_clear_bit()	smp_mb()

#define smp_mb__after_clear_bit()	smp_mb()



#define BITOP_LE_SWIZZLE	((BITS_PER_LONG-1) & ~0x7)



/* Macro for generating the ***_bits() functions */

#define DEFINE_BITOP(fn, op, prefix, postfix)	\

static __inline__ void fn(unsigned long mask,	\

arch/powerpc/include/asm/reg.h

+2 −1
Original line number Diff line number Diff line
@@ -266,7 +266,8 @@ 
#define SPRN_HSRR0	0x13A	/* Hypervisor Save/Restore 0 */

#define SPRN_HSRR1	0x13B	/* Hypervisor Save/Restore 1 */

#define SPRN_FSCR	0x099	/* Facility Status & Control Register */

#define FSCR_TAR	(1<<8)	/* Enable Target Adress Register */

#define   FSCR_TAR	(1 << (63-55)) /* Enable Target Address Register */

#define   FSCR_DSCR	(1 << (63-61)) /* Enable Data Stream Control Register */

#define SPRN_TAR	0x32f	/* Target Address Register */

#define SPRN_LPCR	0x13E	/* LPAR Control Register */

#define   LPCR_VPM0	(1ul << (63-0))

arch/powerpc/include/asm/systbl.h

+1 −0
Original line number Diff line number Diff line
@@ -358,3 +358,4 @@ SYSCALL_SPU(setns) 
COMPAT_SYS(process_vm_readv)

COMPAT_SYS(process_vm_writev)

SYSCALL(finit_module)

SYSCALL(ni_syscall) /* sys_kcmp */

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		354

#define __NR_syscalls		355



#define __NR__exit __NR_exit

#define NR_syscalls	__NR_syscalls