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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os 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

Linus Torvalds 11 years ago c4301c32 c2661b80

+10 -7

7 changed files

expand all

arch

s390

include

uapi

asm

unistd.h

kernel

compat_wrapper.c

syscalls.S

uprobes.c

lib

probes.c

pgtable.c

drivers

s390

char

Kconfig

+2 -1

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

··· 286 286 #define __NR_seccomp 348 287 287 #define __NR_getrandom 349 288 288 #define __NR_memfd_create 350 289 - #define NR_syscalls 351 289 + #define __NR_bpf 351 290 + #define NR_syscalls 352 290 291 291 292 /* 292 293 * There are some system calls that are not present on 64 bit, some

arch/s390/kernel/compat_wrapper.c

··· 217 217 COMPAT_SYSCALL_WRAP3(seccomp, unsigned int, op, unsigned int, flags, const char __user *, uargs) 218 218 COMPAT_SYSCALL_WRAP3(getrandom, char __user *, buf, size_t, count, unsigned int, flags) 219 219 COMPAT_SYSCALL_WRAP2(memfd_create, const char __user *, uname, unsigned int, flags) 220 + COMPAT_SYSCALL_WRAP3(bpf, int, cmd, union bpf_attr *, attr, unsigned int, size);

arch/s390/kernel/syscalls.S

··· 359 359 SYSCALL(sys_seccomp,sys_seccomp,compat_sys_seccomp) 360 360 SYSCALL(sys_getrandom,sys_getrandom,compat_sys_getrandom) 361 361 SYSCALL(sys_memfd_create,sys_memfd_create,compat_sys_memfd_create) /* 350 */ 362 + SYSCALL(sys_bpf,sys_bpf,compat_sys_bpf)

+1 -1

arch/s390/kernel/uprobes.c

··· 5 5 * Author(s): Jan Willeke, 6 6 */ 7 7 8 - #include <linux/kprobes.h> 9 8 #include <linux/uaccess.h> 10 9 #include <linux/uprobes.h> 11 10 #include <linux/compat.h> 12 11 #include <linux/kdebug.h> 13 12 #include <asm/switch_to.h> 14 13 #include <asm/facility.h> 14 + #include <asm/kprobes.h> 15 15 #include <asm/dis.h> 16 16 #include "entry.h" 17 17

+1 -1

arch/s390/lib/probes.c

··· 4 4 * Copyright IBM Corp. 2014 5 5 */ 6 6 7 - #include <linux/kprobes.h> 7 + #include <asm/kprobes.h> 8 8 #include <asm/dis.h> 9 9 10 10 int probe_is_prohibited_opcode(u16 *insn)

+3 -3

arch/s390/mm/pgtable.c

··· 656 656 } 657 657 pgste_set_unlock(ptep, pgste); 658 658 out_pte: 659 - pte_unmap_unlock(*ptep, ptl); 659 + pte_unmap_unlock(ptep, ptl); 660 660 } 661 661 EXPORT_SYMBOL_GPL(__gmap_zap); 662 662 ··· 943 943 } 944 944 if (!(pte_val(*ptep) & _PAGE_INVALID) && 945 945 (pte_val(*ptep) & _PAGE_PROTECT)) { 946 - pte_unmap_unlock(*ptep, ptl); 946 + pte_unmap_unlock(ptep, ptl); 947 947 if (fixup_user_fault(current, mm, addr, FAULT_FLAG_WRITE)) { 948 948 up_read(&mm->mmap_sem); 949 949 return -EFAULT; ··· 974 974 pgste_val(new) |= PGSTE_UC_BIT; 975 975 976 976 pgste_set_unlock(ptep, new); 977 - pte_unmap_unlock(*ptep, ptl); 977 + pte_unmap_unlock(ptep, ptl); 978 978 up_read(&mm->mmap_sem); 979 979 return 0; 980 980 }

+1 -1

drivers/s390/char/Kconfig

··· 105 105 config HMC_DRV 106 106 def_tristate m 107 107 prompt "Support for file transfers from HMC drive CD/DVD-ROM" 108 - depends on 64BIT 108 + depends on S390 && 64BIT 109 109 select CRC16 110 110 help 111 111 This option enables support for file transfers from a Hardware