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

Commit 6fb400d3 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 fixes from Martin Schwidefsky:
 "Two small performance tweaks, the plumbing for the execveat system
  call and a couple of bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/uprobes: fix user space PER events
  s390/bpf: Fix JMP_JGE_X (A > X) and JMP_JGT_X (A >= X)
  s390/bpf: Fix ALU_NEG (A = -A)
  s390/mm: avoid using pmd_to_page for !USE_SPLIT_PMD_PTLOCKS
  s390/timex: fix get_tod_clock_ext() inline assembly
  s390: wire up execveat syscall
  s390/kernel: use stnsm 255 instead of stosm 0
  s390/vtime: Get rid of redundant WARN_ON
  s390/zcrypt: kernel oops at insmod of the z90crypt device driver
parents fb005c47 8d1a2427

arch/s390/hypfs/hypfs_vm.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ int hypfs_vm_create_files(struct dentry *root) 
struct dbfs_d2fc_hdr {

	u64	len;		/* Length of d2fc buffer without header */

	u16	version;	/* Version of header */

	char	tod_ext[16];	/* TOD clock for d2fc */

	char	tod_ext[STORE_CLOCK_EXT_SIZE]; /* TOD clock for d2fc */

	u64	count;		/* Number of VM guests in d2fc buffer */

	char	reserved[30];

} __attribute__ ((packed));

arch/s390/include/asm/irqflags.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static inline notrace void __arch_local_irq_ssm(unsigned long flags) 


static inline notrace unsigned long arch_local_save_flags(void)

{

	return __arch_local_irq_stosm(0x00);

	return __arch_local_irq_stnsm(0xff);

}



static inline notrace unsigned long arch_local_irq_save(void)

arch/s390/include/asm/timex.h

+6 −4
Original line number Diff line number Diff line
@@ -68,19 +68,21 @@ static inline void local_tick_enable(unsigned long long comp) 
}



#define CLOCK_TICK_RATE		1193180 /* Underlying HZ */

#define STORE_CLOCK_EXT_SIZE	16	/* stcke writes 16 bytes */



typedef unsigned long long cycles_t;



static inline void get_tod_clock_ext(char clk[16])

static inline void get_tod_clock_ext(char *clk)

{

	typedef struct { char _[sizeof(clk)]; } addrtype;

	typedef struct { char _[STORE_CLOCK_EXT_SIZE]; } addrtype;



	asm volatile("stcke %0" : "=Q" (*(addrtype *) clk) : : "cc");

}



static inline unsigned long long get_tod_clock(void)

{

	unsigned char clk[16];

	unsigned char clk[STORE_CLOCK_EXT_SIZE];



	get_tod_clock_ext(clk);

	return *((unsigned long long *)&clk[1]);

}

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

+2 −1
Original line number Diff line number Diff line
@@ -289,7 +289,8 @@ 
#define __NR_bpf		351

#define __NR_s390_pci_mmio_write	352

#define __NR_s390_pci_mmio_read		353

#define NR_syscalls 354

#define __NR_execveat		354

#define NR_syscalls 355



/* 

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

arch/s390/kernel/syscalls.S

+1 −0
Original line number Diff line number Diff line
@@ -362,3 +362,4 @@ SYSCALL(sys_memfd_create,sys_memfd_create,compat_sys_memfd_create) /* 350 */ 
SYSCALL(sys_bpf,sys_bpf,compat_sys_bpf)

SYSCALL(sys_ni_syscall,sys_s390_pci_mmio_write,compat_sys_s390_pci_mmio_write)

SYSCALL(sys_ni_syscall,sys_s390_pci_mmio_read,compat_sys_s390_pci_mmio_read)

SYSCALL(sys_execveat,sys_execveat,compat_sys_execveat)