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

Commit b2d67448 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] Fix sparse warnings.
  [S390] path grouping and path verifications fixes.
  [S390] xpram module parameter parsing.
  [S390] cpu_relax() is supposed to have barrier() semantics.
  [S390] fix futex_atomic_cmpxchg_inatomic
  [S390] subchannel register/unregister mutex.
  [S390] raw_local_save_flags/raw_local_irq_restore type check
  [S390] __builtin_trap() and gcc version.
parents c6764664 d2c993d8

arch/s390/hypfs/hypfs_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static void *diag204_get_buffer(enum diag204_format fmt, int *pages) 
		*pages = 1;

		return diag204_alloc_rbuf();

	} else {/* INFO_EXT */

		*pages = diag204(SUBC_RSI | INFO_EXT, 0, 0);

		*pages = diag204(SUBC_RSI | INFO_EXT, 0, NULL);

		if (*pages <= 0)

			return ERR_PTR(-ENOSYS);

		else

arch/s390/kernel/compat_linux.c

+12 −7
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ asmlinkage long sys32_sysinfo(struct sysinfo32 __user *info) 
	mm_segment_t old_fs = get_fs ();

	

	set_fs (KERNEL_DS);

	ret = sys_sysinfo(&s);

	ret = sys_sysinfo((struct sysinfo __user *) &s);

	set_fs (old_fs);

	err = put_user (s.uptime, &info->uptime);

	err |= __put_user (s.loads[0], &info->loads[0]);
@@ -438,7 +438,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid, 
	mm_segment_t old_fs = get_fs ();

	

	set_fs (KERNEL_DS);

	ret = sys_sched_rr_get_interval(pid, &t);

	ret = sys_sched_rr_get_interval(pid, (struct timespec __user *) &t);

	set_fs (old_fs);

	if (put_compat_timespec(&t, interval))

		return -EFAULT;
@@ -464,7 +464,10 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set, 
		}

	}

	set_fs (KERNEL_DS);

	ret = sys_rt_sigprocmask(how, set ? &s : NULL, oset ? &s : NULL, sigsetsize);

	ret = sys_rt_sigprocmask(how,

				 set ? (sigset_t __user *) &s : NULL,

				 oset ? (sigset_t __user *) &s : NULL,

				 sigsetsize);

	set_fs (old_fs);

	if (ret) return ret;

	if (oset) {
@@ -489,7 +492,7 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set, 
	mm_segment_t old_fs = get_fs();

		

	set_fs (KERNEL_DS);

	ret = sys_rt_sigpending(&s, sigsetsize);

	ret = sys_rt_sigpending((sigset_t __user *) &s, sigsetsize);

	set_fs (old_fs);

	if (!ret) {

		switch (_NSIG_WORDS) {
@@ -514,7 +517,7 @@ sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *uinfo) 
	if (copy_siginfo_from_user32(&info, uinfo))

		return -EFAULT;

	set_fs (KERNEL_DS);

	ret = sys_rt_sigqueueinfo(pid, sig, &info);

	ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *) &info);

	set_fs (old_fs);

	return ret;

}
@@ -674,7 +677,8 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offse 
		return -EFAULT;

		

	set_fs(KERNEL_DS);

	ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count);

	ret = sys_sendfile(out_fd, in_fd,

			   offset ? (off_t __user *) &of : NULL, count);

	set_fs(old_fs);

	

	if (offset && put_user(of, offset))
@@ -694,7 +698,8 @@ asmlinkage long sys32_sendfile64(int out_fd, int in_fd, 
		return -EFAULT;

		

	set_fs(KERNEL_DS);

	ret = sys_sendfile64(out_fd, in_fd, offset ? &lof : NULL, count);

	ret = sys_sendfile64(out_fd, in_fd,

			     offset ? (loff_t __user *) &lof : NULL, count);

	set_fs(old_fs);

	

	if (offset && put_user(lof, offset))

arch/s390/kernel/machine_kexec.c

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ NORET_TYPE void 
machine_kexec(struct kimage *image)

{

	clear_all_subchannels();

	cio_reset_channel_paths();



	/* Disable lowcore protection */

	ctl_clear_bit(0,28);

arch/s390/kernel/module.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, 
	int nrela, i, j;



	/* Find symbol table and string table. */

	symtab = 0;

	symtab = NULL;

	for (i = 0; i < hdr->e_shnum; i++)

		switch (sechdrs[i].sh_type) {

		case SHT_SYMTAB:

arch/s390/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ void show_regs(struct pt_regs *regs) 
	show_registers(regs);

	/* Show stack backtrace if pt_regs is from kernel mode */

	if (!(regs->psw.mask & PSW_MASK_PSTATE))

		show_trace(0,(unsigned long *) regs->gprs[15]);

		show_trace(NULL, (unsigned long *) regs->gprs[15]);

}



extern void kernel_thread_starter(void);