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

Commit c4301c32 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 updates from Martin Schwidefsky:
 "One patch to enable the BPF system call and three more bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/uprobes: fix kprobes dependency
  s390: wire up bpf syscall
  s390/mm: fixing calls of pte_unmap_unlock
  s390/hmcdrv: Restrict s390 HMC driver to S390 arch
parents c2661b80 d6fe5be3

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

+2 −1
Original line number Diff line number Diff line
@@ -286,7 +286,8 @@ 
#define __NR_seccomp		348

#define __NR_getrandom		349

#define __NR_memfd_create	350

#define NR_syscalls 351

#define __NR_bpf		351

#define NR_syscalls 352



/* 

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

arch/s390/kernel/compat_wrapper.c

+1 −0
Original line number Diff line number Diff line
@@ -217,3 +217,4 @@ COMPAT_SYSCALL_WRAP5(renameat2, int, olddfd, const char __user *, oldname, int, 
COMPAT_SYSCALL_WRAP3(seccomp, unsigned int, op, unsigned int, flags, const char __user *, uargs)

COMPAT_SYSCALL_WRAP3(getrandom, char __user *, buf, size_t, count, unsigned int, flags)

COMPAT_SYSCALL_WRAP2(memfd_create, const char __user *, uname, unsigned int, flags)

COMPAT_SYSCALL_WRAP3(bpf, int, cmd, union bpf_attr *, attr, unsigned int, size);

arch/s390/kernel/syscalls.S

+1 −0
Original line number Diff line number Diff line
@@ -359,3 +359,4 @@ SYSCALL(sys_renameat2,sys_renameat2,compat_sys_renameat2) 
SYSCALL(sys_seccomp,sys_seccomp,compat_sys_seccomp)

SYSCALL(sys_getrandom,sys_getrandom,compat_sys_getrandom)

SYSCALL(sys_memfd_create,sys_memfd_create,compat_sys_memfd_create) /* 350 */

SYSCALL(sys_bpf,sys_bpf,compat_sys_bpf)

arch/s390/kernel/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
 *    Author(s): Jan Willeke,

 */



#include <linux/kprobes.h>

#include <linux/uaccess.h>

#include <linux/uprobes.h>

#include <linux/compat.h>

#include <linux/kdebug.h>

#include <asm/switch_to.h>

#include <asm/facility.h>

#include <asm/kprobes.h>

#include <asm/dis.h>

#include "entry.h"

arch/s390/lib/probes.c

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 *    Copyright IBM Corp. 2014

 */



#include <linux/kprobes.h>

#include <asm/kprobes.h>

#include <asm/dis.h>



int probe_is_prohibited_opcode(u16 *insn)