Skip to content
Snippets Groups Projects
Commit c6b3e969 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull s390 fixes from Martin Schwidefsky:

 - three more patches in regard to the SPDX license tags. The missing
   tags for the files in arch/s390/kvm will be merged via the KVM tree.
   With that all s390 related files should have their SPDX tags.

 - a patch to get rid of 'struct timespec' in the DASD driver.

 - bug fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: fix compat system call table
  s390/mm: fix off-by-one bug in 5-level page table handling
  s390: Remove redudant license text
  s390: add a few more SPDX identifiers
  s390/dasd: prevent prefix I/O error
  s390: always save and restore all registers on context switch
  s390/dasd: remove 'struct timespec' usage
  s390/qdio: restrict target-full handling to IQDIO
  s390/qdio: consider ERROR buffers for inbound-full condition
  s390/virtio: add BSD license to virtio-ccw
parents 6e7e7f4d e779498d
No related branches found
No related tags found
No related merge requests found
Showing
with 34 additions and 28 deletions
# SPDX-License-Identifier: GPL-2.0
obj-y += kernel/ obj-y += kernel/
obj-y += mm/ obj-y += mm/
obj-$(CONFIG_KVM) += kvm/ obj-$(CONFIG_KVM) += kvm/
......
# SPDX-License-Identifier: GPL-2.0
# #
# Makefile for the Linux - z/VM Monitor Stream. # Makefile for the Linux - z/VM Monitor Stream.
# #
......
/* SPDX-License-Identifier: GPL-2.0 */
SECTIONS SECTIONS
{ {
.rodata.compressed : { .rodata.compressed : {
......
// SPDX-License-Identifier: GPL-2.0+
/* /*
* Cryptographic API. * Cryptographic API.
* *
...@@ -16,12 +17,6 @@ ...@@ -16,12 +17,6 @@
* Copyright (c) Alan Smithee. * Copyright (c) Alan Smithee.
* Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk> * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
* Copyright (c) Jean-Francois Dive <jef@linuxbe.org> * Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
*/ */
#include <crypto/internal/hash.h> #include <crypto/internal/hash.h>
#include <linux/init.h> #include <linux/init.h>
......
# SPDX-License-Identifier: GPL-2.0
# #
# Makefile for the linux hypfs filesystem routines. # Makefile for the linux hypfs filesystem routines.
# #
......
# SPDX-License-Identifier: GPL-2.0
generic-y += asm-offsets.h generic-y += asm-offsets.h
generic-y += cacheflush.h generic-y += cacheflush.h
generic-y += clkdev.h generic-y += clkdev.h
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_S390_ALTERNATIVE_H #ifndef _ASM_S390_ALTERNATIVE_H
#define _ASM_S390_ALTERNATIVE_H #define _ASM_S390_ALTERNATIVE_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Adjunct processor (AP) interfaces * Adjunct processor (AP) interfaces
* *
* Copyright IBM Corp. 2017 * Copyright IBM Corp. 2017
* *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License (version 2 only)
* as published by the Free Software Foundation.
*
* Author(s): Tony Krowiak <akrowia@linux.vnet.ibm.com> * Author(s): Tony Krowiak <akrowia@linux.vnet.ibm.com>
* Martin Schwidefsky <schwidefsky@de.ibm.com> * Martin Schwidefsky <schwidefsky@de.ibm.com>
* Harald Freudenberger <freude@de.ibm.com> * Harald Freudenberger <freude@de.ibm.com>
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* S390 version * S390 version
* Copyright IBM Corp. 1999 * Copyright IBM Corp. 1999
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_SEGMENT_H #ifndef _ASM_SEGMENT_H
#define _ASM_SEGMENT_H #define _ASM_SEGMENT_H
......
...@@ -31,19 +31,18 @@ static inline void restore_access_regs(unsigned int *acrs) ...@@ -31,19 +31,18 @@ static inline void restore_access_regs(unsigned int *acrs)
} }
#define switch_to(prev, next, last) do { \ #define switch_to(prev, next, last) do { \
if (prev->mm) { \ /* save_fpu_regs() sets the CIF_FPU flag, which enforces \
* a restore of the floating point / vector registers as \
* soon as the next task returns to user space \
*/ \
save_fpu_regs(); \ save_fpu_regs(); \
save_access_regs(&prev->thread.acrs[0]); \ save_access_regs(&prev->thread.acrs[0]); \
save_ri_cb(prev->thread.ri_cb); \ save_ri_cb(prev->thread.ri_cb); \
save_gs_cb(prev->thread.gs_cb); \ save_gs_cb(prev->thread.gs_cb); \
} \
update_cr_regs(next); \ update_cr_regs(next); \
if (next->mm) { \
set_cpu_flag(CIF_FPU); \
restore_access_regs(&next->thread.acrs[0]); \ restore_access_regs(&next->thread.acrs[0]); \
restore_ri_cb(next->thread.ri_cb, prev->thread.ri_cb); \ restore_ri_cb(next->thread.ri_cb, prev->thread.ri_cb); \
restore_gs_cb(next->thread.gs_cb); \ restore_gs_cb(next->thread.gs_cb); \
} \
prev = __switch_to(prev, next); \ prev = __switch_to(prev, next); \
} while (0) } while (0)
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_S390_VGA_H #ifndef _ASM_S390_VGA_H
#define _ASM_S390_VGA_H #define _ASM_S390_VGA_H
......
# SPDX-License-Identifier: GPL-2.0
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
......
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
#ifndef _ASM_S390_PERF_REGS_H #ifndef _ASM_S390_PERF_REGS_H
#define _ASM_S390_PERF_REGS_H #define _ASM_S390_PERF_REGS_H
......
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
#ifndef _UAPI_ASM_STHYI_H #ifndef _UAPI_ASM_STHYI_H
#define _UAPI_ASM_STHYI_H #define _UAPI_ASM_STHYI_H
......
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
/* /*
* Definitions for virtio-ccw devices. * Definitions for virtio-ccw devices.
* *
......
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
/* /*
* Copyright IBM Corp. 2004, 2005 * Copyright IBM Corp. 2004, 2005
* Interface implementation for communication with the z/VM control program * Interface implementation for communication with the z/VM control program
......
// SPDX-License-Identifier: GPL-2.0
#include <linux/module.h> #include <linux/module.h>
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/facility.h> #include <asm/facility.h>
......
// SPDX-License-Identifier: GPL-2.0
#include <linux/perf_event.h> #include <linux/perf_event.h>
#include <linux/perf_regs.h> #include <linux/perf_regs.h>
#include <linux/kernel.h> #include <linux/kernel.h>
......
...@@ -370,10 +370,10 @@ SYSCALL(sys_recvmmsg,compat_sys_recvmmsg) ...@@ -370,10 +370,10 @@ SYSCALL(sys_recvmmsg,compat_sys_recvmmsg)
SYSCALL(sys_sendmmsg,compat_sys_sendmmsg) SYSCALL(sys_sendmmsg,compat_sys_sendmmsg)
SYSCALL(sys_socket,sys_socket) SYSCALL(sys_socket,sys_socket)
SYSCALL(sys_socketpair,compat_sys_socketpair) /* 360 */ SYSCALL(sys_socketpair,compat_sys_socketpair) /* 360 */
SYSCALL(sys_bind,sys_bind) SYSCALL(sys_bind,compat_sys_bind)
SYSCALL(sys_connect,sys_connect) SYSCALL(sys_connect,compat_sys_connect)
SYSCALL(sys_listen,sys_listen) SYSCALL(sys_listen,sys_listen)
SYSCALL(sys_accept4,sys_accept4) SYSCALL(sys_accept4,compat_sys_accept4)
SYSCALL(sys_getsockopt,compat_sys_getsockopt) /* 365 */ SYSCALL(sys_getsockopt,compat_sys_getsockopt) /* 365 */
SYSCALL(sys_setsockopt,compat_sys_setsockopt) SYSCALL(sys_setsockopt,compat_sys_setsockopt)
SYSCALL(sys_getsockname,compat_sys_getsockname) SYSCALL(sys_getsockname,compat_sys_getsockname)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment