Commit 9f4863b7 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] Add missing compat system call wrappers.
  [S390] etr/stp: fix possible deadlock
  [S390] cputime: fix lowcore initialization on cpu hotplug
  [S390] fix compat sigaltstack syscall table entry
  [S390] personality: fix personality loss on execve
parents 832fb4a0 e34a6280

arch/s390/include/asm/elf.h

+8 −8
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ extern char elf_platform[]; 
#else /* __s390x__ */

#define SET_PERSONALITY(ex)					\

do {								\

	if (current->personality != PER_LINUX32)	\

	if (personality(current->personality) != PER_LINUX32)	\

		set_personality(PER_LINUX);			\

	if ((ex).e_ident[EI_CLASS] == ELFCLASS32)		\

		set_thread_flag(TIF_31BIT);			\

arch/s390/kernel/compat_wrapper.S

+38 −0
Original line number Diff line number Diff line
@@ -1767,3 +1767,41 @@ sys_dup3_wrapper: 
sys_epoll_create1_wrapper:

	lgfr	%r2,%r2			# int

	jg	sys_epoll_create1	# branch to system call



	.globl	sys32_readahead_wrapper

sys32_readahead_wrapper:

	lgfr	%r2,%r2			# int

	llgfr	%r3,%r3			# u32

	llgfr	%r4,%r4			# u32

	lgfr	%r5,%r5			# s32

	jg	sys32_readahead		# branch to system call



	.globl	sys32_sendfile64_wrapper

sys32_sendfile64_wrapper:

	lgfr	%r2,%r2			# int

	lgfr	%r3,%r3			# int

	llgtr	%r4,%r4			# compat_loff_t *

	lgfr	%r5,%r5			# s32

	jg	sys32_sendfile64	# branch to system call



	.globl	sys_tkill_wrapper

sys_tkill_wrapper:

	lgfr	%r2,%r2			# pid_t

	lgfr	%r3,%r3			# int

	jg	sys_tkill		# branch to system call



	.globl	sys_tgkill_wrapper

sys_tgkill_wrapper:

	lgfr	%r2,%r2			# pid_t

	lgfr	%r3,%r3			# pid_t

	lgfr	%r4,%r4			# int

	jg	sys_tgkill		# branch to system call



	.globl	compat_sys_keyctl_wrapper

compat_sys_keyctl_wrapper:

	llgfr	%r2,%r2			# u32

	llgfr	%r3,%r3			# u32

	llgfr	%r4,%r4			# u32

	llgfr	%r5,%r5			# u32

	llgfr	%r6,%r6			# u32

	jg	compat_sys_keyctl	# branch to system call

arch/s390/kernel/syscalls.S

+6 −6
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ SYSCALL(sys_chown16,sys_ni_syscall,sys32_chown16_wrapper) /* old chown16 syscall 
SYSCALL(sys_getcwd,sys_getcwd,sys32_getcwd_wrapper)

SYSCALL(sys_capget,sys_capget,sys32_capget_wrapper)

SYSCALL(sys_capset,sys_capset,sys32_capset_wrapper)		/* 185 */

SYSCALL(sys_sigaltstack,sys_sigaltstack,sys32_sigaltstack)

SYSCALL(sys_sigaltstack,sys_sigaltstack,sys32_sigaltstack_wrapper)

SYSCALL(sys_sendfile,sys_sendfile64,sys32_sendfile_wrapper)

NI_SYSCALL							/* streams1 */

NI_SYSCALL							/* streams2 */
@@ -230,8 +230,8 @@ SYSCALL(sys_mincore,sys_mincore,sys32_mincore_wrapper) 
SYSCALL(sys_madvise,sys_madvise,sys32_madvise_wrapper)

SYSCALL(sys_getdents64,sys_getdents64,sys32_getdents64_wrapper)	/* 220 */

SYSCALL(sys_fcntl64,sys_ni_syscall,compat_sys_fcntl64_wrapper)

SYSCALL(sys_readahead,sys_readahead,sys32_readahead)

SYSCALL(sys_sendfile64,sys_ni_syscall,sys32_sendfile64)

SYSCALL(sys_readahead,sys_readahead,sys32_readahead_wrapper)

SYSCALL(sys_sendfile64,sys_ni_syscall,sys32_sendfile64_wrapper)

SYSCALL(sys_setxattr,sys_setxattr,sys32_setxattr_wrapper)

SYSCALL(sys_lsetxattr,sys_lsetxattr,sys32_lsetxattr_wrapper)	/* 225 */

SYSCALL(sys_fsetxattr,sys_fsetxattr,sys32_fsetxattr_wrapper)
@@ -245,11 +245,11 @@ SYSCALL(sys_removexattr,sys_removexattr,sys32_removexattr_wrapper) 
SYSCALL(sys_lremovexattr,sys_lremovexattr,sys32_lremovexattr_wrapper)

SYSCALL(sys_fremovexattr,sys_fremovexattr,sys32_fremovexattr_wrapper)	/* 235 */

SYSCALL(sys_gettid,sys_gettid,sys_gettid)

SYSCALL(sys_tkill,sys_tkill,sys_tkill)

SYSCALL(sys_tkill,sys_tkill,sys_tkill_wrapper)

SYSCALL(sys_futex,sys_futex,compat_sys_futex_wrapper)

SYSCALL(sys_sched_setaffinity,sys_sched_setaffinity,sys32_sched_setaffinity_wrapper)

SYSCALL(sys_sched_getaffinity,sys_sched_getaffinity,sys32_sched_getaffinity_wrapper)	/* 240 */

SYSCALL(sys_tgkill,sys_tgkill,sys_tgkill)

SYSCALL(sys_tgkill,sys_tgkill,sys_tgkill_wrapper)

NI_SYSCALL							/* reserved for TUX */

SYSCALL(sys_io_setup,sys_io_setup,sys32_io_setup_wrapper)

SYSCALL(sys_io_destroy,sys_io_destroy,sys32_io_destroy_wrapper)
@@ -288,7 +288,7 @@ SYSCALL(sys_mq_getsetattr,sys_mq_getsetattr,compat_sys_mq_getsetattr_wrapper) 
SYSCALL(sys_kexec_load,sys_kexec_load,compat_sys_kexec_load_wrapper)

SYSCALL(sys_add_key,sys_add_key,compat_sys_add_key_wrapper)

SYSCALL(sys_request_key,sys_request_key,compat_sys_request_key_wrapper)

SYSCALL(sys_keyctl,sys_keyctl,compat_sys_keyctl)		/* 280 */

SYSCALL(sys_keyctl,sys_keyctl,compat_sys_keyctl_wrapper)		/* 280 */

SYSCALL(sys_waitid,sys_waitid,compat_sys_waitid_wrapper)

SYSCALL(sys_ioprio_set,sys_ioprio_set,sys_ioprio_set_wrapper)

SYSCALL(sys_ioprio_get,sys_ioprio_get,sys_ioprio_get_wrapper)

arch/s390/kernel/time.c

+4 −2
Original line number Diff line number Diff line
@@ -399,8 +399,10 @@ static struct workqueue_struct *time_sync_wq; 


static void __init time_init_wq(void)

{

	if (!time_sync_wq)

	if (time_sync_wq)

		return;

	time_sync_wq = create_singlethread_workqueue("timesync");

	stop_machine_create();

}



/*

arch/s390/kernel/vtime.c

+4 −0
Original line number Diff line number Diff line
@@ -516,8 +516,12 @@ EXPORT_SYMBOL(del_virt_timer); 
 */

void init_cpu_vtimer(void)

{

	struct thread_info *ti = current_thread_info();

	struct vtimer_queue *vq;



	S390_lowcore.user_timer = ti->user_timer;

	S390_lowcore.system_timer = ti->system_timer;



	/* kick the virtual timer */

	asm volatile ("STCK %0" : "=m" (S390_lowcore.last_update_clock));

	asm volatile ("STPT %0" : "=m" (S390_lowcore.last_update_timer));

CRA Git | Maintained and supported by SUSTech CRA and CCSE