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

Commit 511b00a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] zcrypt: fix possible race when unloading zcrypt driver modules
  [S390] zcrypt: fix possible dead lock in AP bus module
  [S390] Wire up sys_utimes.
  [S390] reboot from and dump to SCSI under z/VM fails.
  [S390] Wire up compat_sys_epoll_pwait.
  [S390] strlcpy is smart enough
  [S390] memory detection: fix off by one bug.
  [S390] cio: qdio slsb setup
parents fbeb1f19 43a867a2

arch/s390/kernel/compat_wrapper.S

+17 −0
Original line number Diff line number Diff line
@@ -1665,3 +1665,20 @@ sys_getcpu_wrapper: 
	llgtr	%r3,%r3			# unsigned *

	llgtr	%r4,%r4			# struct getcpu_cache *

	jg	sys_getcpu



	.globl	compat_sys_epoll_pwait_wrapper

compat_sys_epoll_pwait_wrapper:

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# struct compat_epoll_event *

	lgfr	%r4,%r4			# int

	lgfr	%r5,%r5			# int

	llgtr	%r6,%r6			# compat_sigset_t *

	llgf	%r0,164(%r15)		# compat_size_t

	stg	%r0,160(%r15)

	jg	compat_sys_epoll_pwait



	.globl	compat_sys_utimes_wrapper

compat_sys_utimes_wrapper:

	llgtr	%r2,%r2			# char *

	llgtr	%r3,%r3			# struct compat_timeval *

	jg	compat_sys_utimes

arch/s390/kernel/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ debug_info_alloc(char *name, int pages_per_area, int nr_areas, int buf_size, 
	rc->level          = level;

	rc->buf_size       = buf_size;

	rc->entry_size     = sizeof(debug_entry_t) + buf_size;

	strlcpy(rc->name, name, sizeof(rc->name)-1);

	strlcpy(rc->name, name, sizeof(rc->name));

	memset(rc->views, 0, DEBUG_MAX_VIEWS * sizeof(struct debug_view *));

	memset(rc->debugfs_entries, 0 ,DEBUG_MAX_VIEWS *

		sizeof(struct dentry*));

arch/s390/kernel/early.c

+8 −2
Original line number Diff line number Diff line
@@ -141,9 +141,9 @@ static noinline __init void detect_machine_type(void) 
		machine_flags |= 4;

}



#ifdef CONFIG_64BIT

static noinline __init int memory_fast_detect(void)

{



	unsigned long val0 = 0;

	unsigned long val1 = 0xc;

	int ret = -ENOSYS;
@@ -161,9 +161,15 @@ static noinline __init int memory_fast_detect(void) 
	if (ret || val0 != val1)

		return -ENOSYS;



	memory_chunk[0].size = val0;

	memory_chunk[0].size = val0 + 1;

	return 0;

}

#else

static inline int memory_fast_detect(void)

{

	return -ENOSYS;

}

#endif



#define ADDR2G	(1UL << 31)

arch/s390/kernel/ipl.c

+4 −5
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ static int __init reipl_ccw_init(void) 
	}

	reipl_block_ccw->hdr.len = IPL_PARM_BLK_CCW_LEN;

	reipl_block_ccw->hdr.version = IPL_PARM_BLOCK_VERSION;

	reipl_block_ccw->hdr.blk0_len = sizeof(reipl_block_ccw->ipl_info.ccw);

	reipl_block_ccw->hdr.blk0_len = IPL_PARM_BLK0_CCW_LEN;

	reipl_block_ccw->hdr.pbt = DIAG308_IPL_TYPE_CCW;

	/* check if read scp info worked and set loadparm */

	if (SCCB_VALID)
@@ -880,8 +880,7 @@ static int __init reipl_fcp_init(void) 
	} else {

		reipl_block_fcp->hdr.len = IPL_PARM_BLK_FCP_LEN;

		reipl_block_fcp->hdr.version = IPL_PARM_BLOCK_VERSION;

		reipl_block_fcp->hdr.blk0_len =

			sizeof(reipl_block_fcp->ipl_info.fcp);

		reipl_block_fcp->hdr.blk0_len = IPL_PARM_BLK0_FCP_LEN;

		reipl_block_fcp->hdr.pbt = DIAG308_IPL_TYPE_FCP;

		reipl_block_fcp->ipl_info.fcp.opt = DIAG308_IPL_OPT_IPL;

	}
@@ -930,7 +929,7 @@ static int __init dump_ccw_init(void) 
	}

	dump_block_ccw->hdr.len = IPL_PARM_BLK_CCW_LEN;

	dump_block_ccw->hdr.version = IPL_PARM_BLOCK_VERSION;

	dump_block_ccw->hdr.blk0_len = sizeof(reipl_block_ccw->ipl_info.ccw);

	dump_block_ccw->hdr.blk0_len = IPL_PARM_BLK0_CCW_LEN;

	dump_block_ccw->hdr.pbt = DIAG308_IPL_TYPE_CCW;

	dump_capabilities |= IPL_TYPE_CCW;

	return 0;
@@ -954,7 +953,7 @@ static int __init dump_fcp_init(void) 
	}

	dump_block_fcp->hdr.len = IPL_PARM_BLK_FCP_LEN;

	dump_block_fcp->hdr.version = IPL_PARM_BLOCK_VERSION;

	dump_block_fcp->hdr.blk0_len = sizeof(dump_block_fcp->ipl_info.fcp);

	dump_block_fcp->hdr.blk0_len = IPL_PARM_BLK0_FCP_LEN;

	dump_block_fcp->hdr.pbt = DIAG308_IPL_TYPE_FCP;

	dump_block_fcp->ipl_info.fcp.opt = DIAG308_IPL_OPT_DUMP;

	dump_capabilities |= IPL_TYPE_FCP;

arch/s390/kernel/syscalls.S

+2 −1
Original line number Diff line number Diff line
@@ -320,4 +320,5 @@ SYSCALL(sys_tee,sys_tee,sys_tee_wrapper) 
SYSCALL(sys_vmsplice,sys_vmsplice,compat_sys_vmsplice_wrapper)

NI_SYSCALL							/* 310 sys_move_pages */

SYSCALL(sys_getcpu,sys_getcpu,sys_getcpu_wrapper)

SYSCALL(sys_epoll_pwait,sys_epoll_pwait,sys_ni_syscall)
 
SYSCALL(sys_epoll_pwait,sys_epoll_pwait,compat_sys_epoll_pwait_wrapper)

SYSCALL(sys_utimes,sys_utimes,compat_sys_utimes_wrapper)