Commit 0f689a33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 patches from Martin Schwidefsky:
 "An update to the oops output with additional information about the
  crash.  The renameat2 system call is enabled.  Two patches in regard
  to the PTR_ERR_OR_ZERO cleanup.  And a bunch of bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/sclp_cmd: replace PTR_RET with PTR_ERR_OR_ZERO
  s390/sclp: replace PTR_RET with PTR_ERR_OR_ZERO
  s390/sclp_vt220: Fix kernel panic due to early terminal input
  s390/compat: fix typo
  s390/uaccess: fix possible register corruption in strnlen_user_srst()
  s390: add 31 bit warning message
  s390: wire up sys_renameat2
  s390: show_registers() should not map user space addresses to kernel symbols
  s390/mm: print control registers and page table walk on crash
  s390/smp: fix smp_stop_cpu() for !CONFIG_SMP
  s390: fix control register update
parents 7d38cc02 5896f8fe

arch/s390/include/asm/sigp.h

+19 −0
Original line number Diff line number Diff line
@@ -31,4 +31,23 @@ 
#define SIGP_STATUS_INCORRECT_STATE	0x00000200UL

#define SIGP_STATUS_NOT_RUNNING		0x00000400UL



#ifndef __ASSEMBLY__



static inline int __pcpu_sigp(u16 addr, u8 order, u32 parm, u32 *status)

{

	register unsigned int reg1 asm ("1") = parm;

	int cc;



	asm volatile(

		"	sigp	%1,%2,0(%3)\n"

		"	ipm	%0\n"

		"	srl	%0,28\n"

		: "=d" (cc), "+d" (reg1) : "d" (addr), "a" (order) : "cc");

	if (status && cc == 1)

		*status = reg1;

	return cc;

}



#endif /* __ASSEMBLY__ */



#endif /* __S390_ASM_SIGP_H */

arch/s390/include/asm/smp.h

+12 −1
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
#ifndef __ASM_SMP_H

#define __ASM_SMP_H



#include <asm/sigp.h>



#ifdef CONFIG_SMP



#include <asm/lowcore.h>
@@ -50,9 +52,18 @@ static inline int smp_store_status(int cpu) { return 0; } 
static inline int smp_vcpu_scheduled(int cpu) { return 1; }

static inline void smp_yield_cpu(int cpu) { }

static inline void smp_yield(void) { }

static inline void smp_stop_cpu(void) { }

static inline void smp_fill_possible_mask(void) { }



static inline void smp_stop_cpu(void)

{

	u16 pcpu = stap();



	for (;;) {

		__pcpu_sigp(pcpu, SIGP_STOP, 0, NULL);

		cpu_relax();

	}

}



#endif /* CONFIG_SMP */



#ifdef CONFIG_HOTPLUG_CPU

arch/s390/include/uapi/asm/unistd.h

+2 −1
Original line number Diff line number Diff line
@@ -282,7 +282,8 @@ 
#define __NR_finit_module	344

#define __NR_sched_setattr	345

#define __NR_sched_getattr	346

#define NR_syscalls 345

#define __NR_renameat2		347

#define NR_syscalls 348



/* 

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

arch/s390/kernel/compat_wrapper.c

+2 −1
Original line number Diff line number Diff line 
/*

 *  Compat sytem call wrappers.

 *  Compat system call wrappers.

 *

 *    Copyright IBM Corp. 2014

 */
@@ -213,3 +213,4 @@ COMPAT_SYSCALL_WRAP5(kcmp, pid_t, pid1, pid_t, pid2, int, type, unsigned long, i 
COMPAT_SYSCALL_WRAP3(finit_module, int, fd, const char __user *, uargs, int, flags);

COMPAT_SYSCALL_WRAP3(sched_setattr, pid_t, pid, struct sched_attr __user *, attr, unsigned int, flags);

COMPAT_SYSCALL_WRAP4(sched_getattr, pid_t, pid, struct sched_attr __user *, attr, unsigned int, size, unsigned int, flags);

COMPAT_SYSCALL_WRAP5(renameat2, int, olddfd, const char __user *, oldname, int, newdfd, const char __user *, newname, unsigned int, flags);

arch/s390/kernel/dumpstack.c

+4 −4
Original line number Diff line number Diff line
@@ -144,10 +144,10 @@ void show_registers(struct pt_regs *regs) 
	char *mode;



	mode = user_mode(regs) ? "User" : "Krnl";

	printk("%s PSW : %p %p (%pSR)\n",

	       mode, (void *) regs->psw.mask,

	       (void *) regs->psw.addr,

	       (void *) regs->psw.addr);

	printk("%s PSW : %p %p", mode, (void *)regs->psw.mask, (void *)regs->psw.addr);

	if (!user_mode(regs))

		printk(" (%pSR)", (void *)regs->psw.addr);

	printk("\n");

	printk("           R:%x T:%x IO:%x EX:%x Key:%x M:%x W:%x "

	       "P:%x AS:%x CC:%x PM:%x", mask_bits(regs, PSW_MASK_PER),

	       mask_bits(regs, PSW_MASK_DAT), mask_bits(regs, PSW_MASK_IO),

CRA Git | Maintained and supported by SUSTech CRA and CCSE