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

Commit ecd5907a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] Use strim instead of strstrip to avoid false warnings.
  [S390] qdio: add counter for input queue full condition
  [S390] qdio: remove superfluous log entries and WARN_ONs.
  [S390] ptrace: dont abuse PT_PTRACED
  [S390] cio: fix channel path vary
  [S390] drivers: Correct size given to memset
  [S390] tape: Add pr_fmt() macro to all tape source files
  [S390] rename NT_PRXSTATUS to NT_S390_HIGHREGS
  [S390] tty: PTR_ERR return of wrong pointer in fs3270_open()
  [S390] s390: PTR_ERR return of wrong pointer in fallback_init_cip()
  [S390] dasd: PTR_ERR return of wrong pointer in
  [S390] dasd: move dasd-diag kmsg to dasd
  [S390] cio: fix drvdata usage for the console subchannel
  [S390] wire up sys_recvmmsg
parents b4c30aad 1d802e24

arch/s390/crypto/aes_s390.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int fallback_init_cip(struct crypto_tfm *tfm) 
	if (IS_ERR(sctx->fallback.cip)) {

		pr_err("Allocating AES fallback algorithm %s failed\n",

		       name);

		return PTR_ERR(sctx->fallback.blk);

		return PTR_ERR(sctx->fallback.cip);

	}



	return 0;

arch/s390/hypfs/hypfs_diag.c

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static inline void part_hdr__part_name(enum diag204_format type, void *hdr, 
		       LPAR_NAME_LEN);

	EBCASC(name, LPAR_NAME_LEN);

	name[LPAR_NAME_LEN] = 0;

	strstrip(name);

	strim(name);

}



struct cpu_info {
@@ -523,7 +523,7 @@ static int diag224_idx2name(int index, char *name) 
	memcpy(name, diag224_cpu_names + ((index + 1) * CPU_NAME_LEN),

		CPU_NAME_LEN);

	name[CPU_NAME_LEN] = 0;

	strstrip(name);

	strim(name);

	return 0;

}

arch/s390/hypfs/hypfs_vm.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int hpyfs_vm_create_guest(struct super_block *sb, 
	/* guest dir */

	memcpy(guest_name, data->guest_name, NAME_LEN);

	EBCASC(guest_name, NAME_LEN);

	strstrip(guest_name);

	strim(guest_name);

	guest_dir = hypfs_mkdir(sb, systems_dir, guest_name);

	if (IS_ERR(guest_dir))

		return PTR_ERR(guest_dir);

arch/s390/include/asm/unistd.h

+2 −1
Original line number Diff line number Diff line
@@ -269,7 +269,8 @@ 
#define	__NR_pwritev		329

#define __NR_rt_tgsigqueueinfo	330

#define __NR_perf_event_open	331

#define NR_syscalls 332

#define __NR_recvmmsg		332

#define NR_syscalls 333



/* 

 * There are some system calls that are not present on 64 bit, some

arch/s390/kernel/compat_wrapper.S

+9 −0
Original line number Diff line number Diff line
@@ -1853,3 +1853,12 @@ sys32_execve_wrapper: 
	llgtr	%r3,%r3			# compat_uptr_t *

	llgtr	%r4,%r4			# compat_uptr_t *

	jg	sys32_execve		# branch to system call



	.globl	compat_sys_recvmmsg_wrapper

compat_sys_recvmmsg_wrapper:

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# struct compat_mmsghdr *

	llgfr	%r4,%r4			# unsigned int

	llgfr	%r5,%r5			# unsigned int

	llgtr	%r6,%r6			# struct compat_timespec *

	jg	compat_sys_recvmmsg