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

22985bf5 · Linus Torvalds <[email protected]> · 2017-11-30 08:13:36 -08:00

Pull s390 fixes from Martin Schwidefsky:

 - SPDX identifiers are added to more of the s390 specific files.

 - The ELF_ET_DYN_BASE base patch from Kees is reverted, with the change
   some old 31-bit programs crash.

 - Bug fixes and cleanups.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (29 commits)
  s390/gs: add compat regset for the guarded storage broadcast control block
  s390: revert ELF_ET_DYN_BASE base changes
  s390: Remove redundant license text
  s390: crypto: Remove redundant license text
  s390: include: Remove redundant license text
  s390: kernel: Remove redundant license text
  s390: add SPDX identifiers to the remaining files
  s390: appldata: add SPDX identifiers to the remaining files
  s390: pci: add SPDX identifiers to the remaining files
  s390: mm: add SPDX identifiers to the remaining files
  s390: crypto: add SPDX identifiers to the remaining files
  s390: kernel: add SPDX identifiers to the remaining files
  s390: sthyi: add SPDX identifiers to the remaining files
  s390: drivers: Remove redundant license text
  s390: crypto: Remove redundant license text
  s390: virtio: add SPDX identifiers to the remaining files
  s390: scsi: zfcp_aux: add SPDX identifier
  s390: net: add SPDX identifiers to the remaining files
  s390: char: add SPDX identifiers to the remaining files
  s390: cio: add SPDX identifiers to the remaining files
  ...

Commit: 22985bf59b0228769dc568d6401ed2090e2eed27
Parents: a0908a1b · 9d0ca444

Merge commit. Changes below are compared with the first parent: a0908a1b.

Changes

137 files changed · +161 −529

File	Status	Add	Del	Content
arch/s390/Makefile	modified	+1	−4	View file
arch/s390/appldata/appldata_base.c	modified	+1	−0	View file
arch/s390/appldata/appldata_mem.c	modified	+1	−0	View file
arch/s390/appldata/appldata_net_sum.c	modified	+1	−0	View file
arch/s390/appldata/appldata_os.c	modified	+1	−0	View file
arch/s390/boot/install.sh	modified	+1	−4	View file
arch/s390/crypto/aes_s390.c	modified	+1	−6	View file
arch/s390/crypto/arch_random.c	modified	+1	−5	View file
arch/s390/crypto/crc32-vx.c	modified	+1	−0	View file
arch/s390/crypto/des_s390.c	modified	+1	−6	View file
arch/s390/crypto/ghash_s390.c	modified	+1	−0	View file
arch/s390/crypto/paes_s390.c	modified	+1	−5	View file
arch/s390/crypto/prng.c	modified	+1	−0	View file
arch/s390/crypto/sha.h	modified	+1	−6	View file
arch/s390/crypto/sha256_s390.c	modified	+1	−6	View file
arch/s390/crypto/sha512_s390.c	modified	+1	−6	View file
arch/s390/crypto/sha_common.c	modified	+1	−6	View file
arch/s390/hypfs/inode.c	modified	+1	−1	View file
arch/s390/include/asm/cpu_mf.h	modified	+1	−4	View file
arch/s390/include/asm/elf.h	modified	+8	−7	View file
arch/s390/include/asm/kprobes.h	modified	+1	−14	View file
arch/s390/include/asm/kvm_host.h	modified	+1	−4	View file
arch/s390/include/asm/kvm_para.h	modified	+1	−6	View file
arch/s390/include/asm/livepatch.h	modified	+1	−7	View file
arch/s390/include/asm/mmu_context.h	modified	+1	−1	View file
arch/s390/include/asm/syscall.h	modified	+1	−4	View file
arch/s390/include/asm/sysinfo.h	modified	+1	−4	View file
arch/s390/include/asm/topology.h	modified	+1	−0	View file
arch/s390/include/uapi/asm/kvm.h	modified	+0	−4	View file
arch/s390/include/uapi/asm/kvm_para.h	modified	+0	−4	View file
arch/s390/include/uapi/asm/kvm_perf.h	modified	+0	−4	View file
arch/s390/include/uapi/asm/virtio-ccw.h	modified	+0	−4	View file
arch/s390/include/uapi/asm/zcrypt.h	modified	+0	−14	View file
arch/s390/kernel/debug.c	modified	+1	−1	View file
arch/s390/kernel/dis.c	modified	+8	−2	View file
arch/s390/kernel/dumpstack.c	modified	+1	−0	View file
arch/s390/kernel/entry.S	modified	+7	−8	View file
arch/s390/kernel/ipl.c	modified	+1	−0	View file
arch/s390/kernel/kprobes.c	modified	+1	−14	View file
arch/s390/kernel/lgr.c	modified	+1	−0	View file
arch/s390/kernel/module.c	modified	+1	−14	View file
arch/s390/kernel/nmi.c	modified	+1	−0	View file
arch/s390/kernel/perf_cpum_cf.c	modified	+1	−4	View file
arch/s390/kernel/perf_cpum_sf.c	modified	+1	−4	View file
arch/s390/kernel/perf_event.c	modified	+1	−4	View file
arch/s390/kernel/ptrace.c	modified	+8	−0	View file
arch/s390/kernel/setup.c	modified	+1	−0	View file
arch/s390/kernel/smp.c	modified	+1	−0	View file
arch/s390/kernel/stacktrace.c	modified	+1	−0	View file
arch/s390/kernel/sthyi.c	modified	+1	−4	View file
arch/s390/kernel/time.c	modified	+1	−0	View file
arch/s390/kernel/topology.c	modified	+1	−0	View file
arch/s390/kernel/vdso.c	modified	+1	−4	View file
arch/s390/kernel/vdso32/clock_getres.S	modified	+1	−4	View file
arch/s390/kernel/vdso32/clock_gettime.S	modified	+1	−4	View file
arch/s390/kernel/vdso32/gettimeofday.S	modified	+1	−4	View file
arch/s390/kernel/vdso64/clock_getres.S	modified	+1	−4	View file
arch/s390/kernel/vdso64/clock_gettime.S	modified	+1	−4	View file
arch/s390/kernel/vdso64/gettimeofday.S	modified	+1	−4	View file
arch/s390/kernel/vtime.c	modified	+1	−0	View file
arch/s390/mm/cmm.c	modified	+1	−0	View file
arch/s390/mm/gmap.c	modified	+1	−0	View file
arch/s390/mm/mmap.c	modified	+1	−15	View file
arch/s390/mm/pgtable.c	modified	+1	−0	View file
arch/s390/pci/pci.c	modified	+1	−0	View file
arch/s390/pci/pci_debug.c	modified	+1	−0	View file
arch/s390/pci/pci_dma.c	modified	+1	−0	View file
arch/s390/pci/pci_insn.c	modified	+1	−0	View file
drivers/s390/block/dasd.c	modified	+1	−0	View file
drivers/s390/block/dasd_devmap.c	modified	+1	−0	View file
drivers/s390/block/dasd_diag.c	modified	+1	−0	View file
drivers/s390/block/dasd_eckd.c	modified	+1	−0	View file
drivers/s390/block/dasd_fba.c	modified	+1	−0	View file
drivers/s390/block/dcssblk.c	modified	+1	−0	View file
drivers/s390/block/scm_blk.c	modified	+1	−0	View file
drivers/s390/block/xpram.c	modified	+1	−0	View file
drivers/s390/char/fs3270.c	modified	+1	−0	View file
drivers/s390/char/hmcdrv_mod.c	modified	+1	−0	View file
drivers/s390/char/monreader.c	modified	+1	−0	View file
drivers/s390/char/monwriter.c	modified	+1	−0	View file
drivers/s390/char/raw3270.c	modified	+1	−0	View file
drivers/s390/char/sclp_async.c	modified	+1	−0	View file
drivers/s390/char/tape_34xx.c	modified	+1	−0	View file
drivers/s390/char/tape_3590.c	modified	+1	−0	View file
drivers/s390/char/tape_class.c	modified	+1	−0	View file
drivers/s390/char/tape_core.c	modified	+1	−0	View file
drivers/s390/char/tty3270.c	modified	+1	−0	View file
drivers/s390/char/vmlogrdr.c	modified	+1	−0	View file
drivers/s390/char/vmur.c	modified	+1	−0	View file
drivers/s390/char/zcore.c	modified	+1	−1	View file
drivers/s390/cio/ccwgroup.c	modified	+1	−0	View file
drivers/s390/cio/chp.c	modified	+1	−0	View file
drivers/s390/cio/chsc.c	modified	+1	−0	View file
drivers/s390/cio/chsc_sch.c	modified	+1	−0	View file
drivers/s390/cio/cio.c	modified	+1	−0	View file
drivers/s390/cio/cmf.c	modified	+1	−14	View file
drivers/s390/cio/css.c	modified	+1	−2	View file
drivers/s390/cio/device.c	modified	+1	−2	View file
drivers/s390/cio/device_fsm.c	modified	+1	−0	View file
drivers/s390/cio/device_ops.c	modified	+1	−2	View file
drivers/s390/cio/eadm_sch.c	modified	+1	−0	View file
drivers/s390/cio/isc.c	modified	+1	−0	View file
drivers/s390/cio/qdio_main.c	modified	+1	−0	View file
drivers/s390/cio/qdio_setup.c	modified	+1	−0	View file
drivers/s390/cio/scm.c	modified	+1	−0	View file
drivers/s390/cio/vfio_ccw_drv.c	modified	+1	−0	View file
drivers/s390/crypto/ap_bus.c	modified	+1	−14	View file
drivers/s390/crypto/ap_bus.h	modified	+1	−14	View file
drivers/s390/crypto/pkey_api.c	modified	+1	−5	View file
drivers/s390/crypto/zcrypt_api.c	modified	+3	−16	View file
drivers/s390/crypto/zcrypt_api.h	modified	+1	−14	View file
drivers/s390/crypto/zcrypt_card.c	modified	+1	−10	View file
drivers/s390/crypto/zcrypt_cca_key.h	modified	+1	−14	View file
drivers/s390/crypto/zcrypt_cex2a.c	modified	+1	−14	View file
drivers/s390/crypto/zcrypt_cex2a.h	modified	+1	−14	View file
drivers/s390/crypto/zcrypt_cex4.c	modified	+1	−0	View file
drivers/s390/crypto/zcrypt_error.h	modified	+1	−14	View file
drivers/s390/crypto/zcrypt_msgtype50.c	modified	+1	−14	View file
drivers/s390/crypto/zcrypt_msgtype50.h	modified	+1	−14	View file
drivers/s390/crypto/zcrypt_msgtype6.c	modified	+1	−14	View file
drivers/s390/crypto/zcrypt_msgtype6.h	modified	+1	−14	View file
drivers/s390/crypto/zcrypt_pcixcc.c	modified	+1	−14	View file
drivers/s390/crypto/zcrypt_pcixcc.h	modified	+1	−14	View file
drivers/s390/crypto/zcrypt_queue.c	modified	+1	−10	View file
drivers/s390/net/ctcm_main.c	modified	+1	−0	View file
drivers/s390/net/fsm.c	modified	+1	−0	View file
drivers/s390/net/lcs.c	modified	+1	−14	View file
drivers/s390/net/netiucv.c	modified	+1	−15	View file
drivers/s390/net/qeth_core_main.c	modified	+1	−0	View file
drivers/s390/net/qeth_core_sys.c	modified	+1	−0	View file
drivers/s390/net/qeth_l2_main.c	modified	+1	−0	View file
drivers/s390/net/qeth_l3_main.c	modified	+1	−0	View file
drivers/s390/net/smsgiucv.c	modified	+1	−14	View file
drivers/s390/net/smsgiucv_app.c	modified	+1	−0	View file
drivers/s390/scsi/zfcp_aux.c	modified	+1	−0	View file
drivers/s390/virtio/Makefile	modified	+1	−4	View file
drivers/s390/virtio/virtio_ccw.c	modified	+1	−4	View file

Only the first 600 diff lines are shown. Download the complete patch.

arch/s390/Makefile

View file

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 6b3f419..de54cfc 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # s390/Makefile
 #
@@ -6,10 +7,6 @@
 # for "archclean" and "archdep" for cleaning up and making dependencies for
 # this architecture
 #
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
 # Copyright (C) 1994 by Linus Torvalds
 #
 

arch/s390/appldata/appldata_base.c

View file

diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index ef3fb1b..cb6e806 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Base infrastructure for Linux-z/VM Monitor Stream, Stage 1.
  * Exports appldata_register_ops() and appldata_unregister_ops() for the

arch/s390/appldata/appldata_mem.c

View file

diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index 598df57..e68136c 100644
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Data gathering module for Linux-VM Monitor Stream, Stage 1.
  * Collects data related to memory management.

arch/s390/appldata/appldata_net_sum.c

View file

diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c
index 66037d2..8bc14b0 100644
--- a/arch/s390/appldata/appldata_net_sum.c
+++ b/arch/s390/appldata/appldata_net_sum.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Data gathering module for Linux-VM Monitor Stream, Stage 1.
  * Collects accumulated network statistics (Packets received/transmitted,

arch/s390/appldata/appldata_os.c

View file

diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c
index 45b3178..433a994 100644
--- a/arch/s390/appldata/appldata_os.c
+++ b/arch/s390/appldata/appldata_os.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Data gathering module for Linux-VM Monitor Stream, Stage 1.
  * Collects misc. OS related data (CPU utilization, running processes).

arch/s390/boot/install.sh

View file

diff --git a/arch/s390/boot/install.sh b/arch/s390/boot/install.sh
index aed3069..bed227f 100644
--- a/arch/s390/boot/install.sh
+++ b/arch/s390/boot/install.sh
@@ -1,11 +1,8 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/s390x/boot/install.sh
 #
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
 # Copyright (C) 1995 by Linus Torvalds
 #
 # Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin

arch/s390/crypto/aes_s390.c

View file

diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index b48e20d..d607987 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Cryptographic API.
  *
@@ -11,12 +12,6 @@
  *		Harald Freudenberger <[email protected]>
  *
  * Derived from "crypto/aes_generic.c"
- *
- * 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.
- *
  */
 
 #define KMSG_COMPONENT "aes_s390"

arch/s390/crypto/arch_random.c

View file

diff --git a/arch/s390/crypto/arch_random.c b/arch/s390/crypto/arch_random.c
index 36aefc0..8720e92 100644
--- a/arch/s390/crypto/arch_random.c
+++ b/arch/s390/crypto/arch_random.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * s390 arch random implementation.
  *
  * Copyright IBM Corp. 2017
  * Author(s): Harald Freudenberger <[email protected]>
- *
- * 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.
- *
  */
 
 #include <linux/kernel.h>

arch/s390/crypto/crc32-vx.c

View file

diff --git a/arch/s390/crypto/crc32-vx.c b/arch/s390/crypto/crc32-vx.c
index 992e630..4368659 100644
--- a/arch/s390/crypto/crc32-vx.c
+++ b/arch/s390/crypto/crc32-vx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Crypto-API module for CRC-32 algorithms implemented with the
  * z/Architecture Vector Extension Facility.

arch/s390/crypto/des_s390.c

View file

diff --git a/arch/s390/crypto/des_s390.c b/arch/s390/crypto/des_s390.c
index 0d29666..5346b5a 100644
--- a/arch/s390/crypto/des_s390.c
+++ b/arch/s390/crypto/des_s390.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Cryptographic API.
  *
@@ -6,12 +7,6 @@
  * Copyright IBM Corp. 2003, 2011
  * Author(s): Thomas Spatzier
  *	      Jan Glauber ([email protected])
- *
- * 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 <linux/init.h>

arch/s390/crypto/ghash_s390.c

View file

diff --git a/arch/s390/crypto/ghash_s390.c b/arch/s390/crypto/ghash_s390.c
index 564616d..3b7f96c 100644
--- a/arch/s390/crypto/ghash_s390.c
+++ b/arch/s390/crypto/ghash_s390.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Cryptographic API.
  *

arch/s390/crypto/paes_s390.c

View file

diff --git a/arch/s390/crypto/paes_s390.c b/arch/s390/crypto/paes_s390.c
index a4e903e..003932d 100644
--- a/arch/s390/crypto/paes_s390.c
+++ b/arch/s390/crypto/paes_s390.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Cryptographic API.
  *
@@ -7,11 +8,6 @@
  *   Copyright IBM Corp. 2017
  *   Author(s): Martin Schwidefsky <[email protected]>
  *		Harald Freudenberger <[email protected]>
- *
- * 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.
- *
  */
 
 #define KMSG_COMPONENT "paes_s390"

arch/s390/crypto/prng.c

View file

diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c
index 3e47c4a..a97a180 100644
--- a/arch/s390/crypto/prng.c
+++ b/arch/s390/crypto/prng.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2006, 2015
  * Author(s): Jan Glauber <[email protected]>

arch/s390/crypto/sha.h

View file

diff --git a/arch/s390/crypto/sha.h b/arch/s390/crypto/sha.h
index 10f2007..d6f8258 100644
--- a/arch/s390/crypto/sha.h
+++ b/arch/s390/crypto/sha.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Cryptographic API.
  *
@@ -5,12 +6,6 @@
  *
  * Copyright IBM Corp. 2007
  * Author(s): Jan Glauber ([email protected])
- *
- * 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.
- *
  */
 #ifndef _CRYPTO_ARCH_S390_SHA_H
 #define _CRYPTO_ARCH_S390_SHA_H

arch/s390/crypto/sha256_s390.c

View file

diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index 53c2779..944aa6b 100644
--- a/arch/s390/crypto/sha256_s390.c
+++ b/arch/s390/crypto/sha256_s390.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Cryptographic API.
  *
@@ -6,12 +7,6 @@
  * s390 Version:
  *   Copyright IBM Corp. 2005, 2011
  *   Author(s): Jan Glauber ([email protected])
- *
- * 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 <linux/init.h>

arch/s390/crypto/sha512_s390.c

View file

diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c
index 2f4caa1..b17eded 100644
--- a/arch/s390/crypto/sha512_s390.c
+++ b/arch/s390/crypto/sha512_s390.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Cryptographic API.
  *
@@ -5,12 +6,6 @@
  *
  * Copyright IBM Corp. 2007
  * Author(s): Jan Glauber ([email protected])
- *
- * 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/sha.h>

arch/s390/crypto/sha_common.c

View file

diff --git a/arch/s390/crypto/sha_common.c b/arch/s390/crypto/sha_common.c
index c740f77..cf0718d 100644
--- a/arch/s390/crypto/sha_common.c
+++ b/arch/s390/crypto/sha_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Cryptographic API.
  *
@@ -5,12 +6,6 @@
  *
  * Copyright IBM Corp. 2007
  * Author(s): Jan Glauber ([email protected])
- *
- * 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>

arch/s390/hypfs/inode.c

View file

diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index cf8a2d9..43bbe63 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -1,9 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
 /*
  *    Hypervisor filesystem for Linux on s390.
  *
  *    Copyright IBM Corp. 2006, 2008
  *    Author(s): Michael Holzheu <[email protected]>
- *    License: GPL
  */
 
 #define KMSG_COMPONENT "hypfs"

arch/s390/include/asm/cpu_mf.h

View file

diff --git a/arch/s390/include/asm/cpu_mf.h b/arch/s390/include/asm/cpu_mf.h
index 792cda3..dd08db4 100644
--- a/arch/s390/include/asm/cpu_mf.h
+++ b/arch/s390/include/asm/cpu_mf.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CPU-measurement facilities
  *
  *  Copyright IBM Corp. 2012
  *  Author(s): Hendrik Brueckner <[email protected]>
  *	       Jan Glauber <[email protected]>
- *
- * 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.
  */
 #ifndef _ASM_S390_CPU_MF_H
 #define _ASM_S390_CPU_MF_H

arch/s390/include/asm/elf.h

View file

diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index 9a3cb39..1a61b1b 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -194,13 +194,14 @@ struct arch_elf_state {
 #define CORE_DUMP_USE_REGSET
 #define ELF_EXEC_PAGESIZE	PAGE_SIZE
 
-/*
- * This is the base location for PIE (ET_DYN with INTERP) loads. On
- * 64-bit, this is raised to 4GB to leave the entire 32-bit address
- * space open for things that want to use the area for 32-bit pointers.
- */
-#define ELF_ET_DYN_BASE		(is_compat_task() ? 0x000400000UL : \
-						    0x100000000UL)
+/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
+   use of this is to invoke "./ld.so someprog" to test out a new version of
+   the loader.  We need to make sure that it is out of the way of the program
+   that it will "exec", and that there is sufficient room for the brk. 64-bit
+   tasks are aligned to 4GB. */
+#define ELF_ET_DYN_BASE (is_compat_task() ? \
+				(STACK_TOP / 3 * 2) : \
+				(STACK_TOP / 3 * 2) & ~((1UL << 32) - 1))
 
 /* This yields a mask that user programs can use to figure out what
    instruction set this CPU supports. */

arch/s390/include/asm/kprobes.h

View file

diff --git a/arch/s390/include/asm/kprobes.h b/arch/s390/include/asm/kprobes.h
index 921391f..13de80c 100644
--- a/arch/s390/include/asm/kprobes.h
+++ b/arch/s390/include/asm/kprobes.h
@@ -1,22 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 #ifndef _ASM_S390_KPROBES_H
 #define _ASM_S390_KPROBES_H
 /*
  *  Kernel Probes (KProbes)
  *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
  * Copyright IBM Corp. 2002, 2006
  *
  * 2002-Oct	Created by Vamsi Krishna S <[email protected]> Kernel

arch/s390/include/asm/kvm_host.h

View file

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index f3a9b5a..e14f381 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * definition for kernel virtual machines on s390
  *
  * Copyright IBM Corp. 2008, 2009
  *
- * 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): Carsten Otte <[email protected]>
  */
 

arch/s390/include/asm/kvm_para.h

View file

diff --git a/arch/s390/include/asm/kvm_para.h b/arch/s390/include/asm/kvm_para.h
index 4139305..74eeec9 100644
--- a/arch/s390/include/asm/kvm_para.h
+++ b/arch/s390/include/asm/kvm_para.h
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * definition for paravirtual devices on s390
  *
  * Copyright IBM Corp. 2008
  *
- * 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): Christian Borntraeger <[email protected]>
  */
 /*
@@ -20,8 +17,6 @@
  *
  * Copyright IBM Corp. 2007,2008
  * Author(s): Christian Borntraeger <[email protected]>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.
  */
 #ifndef __S390_KVM_PARA_H
 #define __S390_KVM_PARA_H

arch/s390/include/asm/livepatch.h

View file

diff --git a/arch/s390/include/asm/livepatch.h b/arch/s390/include/asm/livepatch.h
index 6de5c6c..672f95b 100644
--- a/arch/s390/include/asm/livepatch.h
+++ b/arch/s390/include/asm/livepatch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * livepatch.h - s390-specific Kernel Live Patching Core
  *
@@ -7,13 +8,6 @@
  *	      Jiri Slaby
  */
 
-/*
- * 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.
- */
-
 #ifndef ASM_LIVEPATCH_H
 #define ASM_LIVEPATCH_H
 

arch/s390/include/asm/mmu_context.h

View file

diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h
index f4a07f7..65154ea 100644
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@ -28,7 +28,7 @@ static inline int init_new_context(struct task_struct *tsk,
 #ifdef CONFIG_PGSTE
 	mm->context.alloc_pgste = page_table_allocate_pgste ||
 		test_thread_flag(TIF_PGSTE) ||
-		current->mm->context.alloc_pgste;
+		(current->mm && current->mm->context.alloc_pgste);
 	mm->context.has_pgste = 0;
 	mm->context.use_skey = 0;
 	mm->context.use_cmma = 0;

arch/s390/include/asm/syscall.h

View file

diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h
index 6bc941b..96f9a91 100644
--- a/arch/s390/include/asm/syscall.h
+++ b/arch/s390/include/asm/syscall.h
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Access to user system call parameters and results
  *
  *  Copyright IBM Corp. 2008
  *  Author(s): Martin Schwidefsky ([email protected])
- *
- * 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.
  */
 
 #ifndef _ASM_SYSCALL_H

arch/s390/include/asm/sysinfo.h

View file

diff --git a/arch/s390/include/asm/sysinfo.h b/arch/s390/include/asm/sysinfo.h
index a702cb9..25057c1 100644
--- a/arch/s390/include/asm/sysinfo.h
+++ b/arch/s390/include/asm/sysinfo.h
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * definition for store system information stsi
  *
  * Copyright IBM Corp. 2001, 2008
  *
- * 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): Ulrich Weigand <[email protected]>
  *		 Christian Borntraeger <[email protected]>
  */

arch/s390/include/asm/topology.h

View file

diff --git a/arch/s390/include/asm/topology.h b/arch/s390/include/asm/topology.h
index 1807229..cca406f 100644
--- a/arch/s390/include/asm/topology.h
+++ b/arch/s390/include/asm/topology.h
@@ -53,6 +53,7 @@ const struct cpumask *cpu_coregroup_mask(int cpu);
 static inline void topology_init_early(void) { }
 static inline void topology_schedule_update(void) { }
 static inline int topology_cpu_init(struct cpu *cpu) { return 0; }
+static inline int topology_cpu_dedicated(int cpu_nr) { return 0; }
 static inline void topology_expect_change(void) { }
 
 #endif /* CONFIG_SCHED_TOPOLOGY */

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

View file

diff --git a/arch/s390/include/uapi/asm/kvm.h b/arch/s390/include/uapi/asm/kvm.h
index 9ad172d..38535a5 100644
--- a/arch/s390/include/uapi/asm/kvm.h
+++ b/arch/s390/include/uapi/asm/kvm.h
@@ -6,10 +6,6 @@
  *
  * Copyright IBM Corp. 2008
  *
- * 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): Carsten Otte <[email protected]>
  *               Christian Borntraeger <[email protected]>
  */

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

View file

diff --git a/arch/s390/include/uapi/asm/kvm_para.h b/arch/s390/include/uapi/asm/kvm_para.h
index 0dc86b3..b9ab584 100644
--- a/arch/s390/include/uapi/asm/kvm_para.h
+++ b/arch/s390/include/uapi/asm/kvm_para.h
@@ -4,9 +4,5 @@
  *
  * Copyright IBM Corp. 2008
  *
- * 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): Christian Borntraeger <[email protected]>
  */

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

View file

diff --git a/arch/s390/include/uapi/asm/kvm_perf.h b/arch/s390/include/uapi/asm/kvm_perf.h
index c36c97f..84606b8 100644
--- a/arch/s390/include/uapi/asm/kvm_perf.h
+++ b/arch/s390/include/uapi/asm/kvm_perf.h
@@ -4,10 +4,6 @@
  *
  * Copyright 2014 IBM Corp.
  * Author(s): Alexander Yarygin <[email protected]>
- *
- * 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.
  */
 
 #ifndef __LINUX_KVM_PERF_S390_H

arch/s390/include/uapi/asm/virtio-ccw.h

View file

diff --git a/arch/s390/include/uapi/asm/virtio-ccw.h b/arch/s390/include/uapi/asm/virtio-ccw.h
index 967aad3..3a77833 100644
--- a/arch/s390/include/uapi/asm/virtio-ccw.h
+++ b/arch/s390/include/uapi/asm/virtio-ccw.h
@@ -4,10 +4,6 @@
  *
  * Copyright IBM Corp. 2013
  *
- * 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): Cornelia Huck <[email protected]>
  */
 #ifndef __KVM_VIRTIO_CCW_H

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

View file

diff --git a/arch/s390/include/uapi/asm/zcrypt.h b/arch/s390/include/uapi/asm/zcrypt.h
index 137ef47..d568307 100644
--- a/arch/s390/include/uapi/asm/zcrypt.h
+++ b/arch/s390/include/uapi/asm/zcrypt.h
@@ -9,20 +9,6 @@
  *	       Eric Rossman ([email protected])
  *
  *  Hotplug & misc device support: Jochen Roehrig ([email protected])
- *
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef __ASM_S390_ZCRYPT_H

arch/s390/kernel/debug.c

View file

diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index 58b9e12..80e974a 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -1392,7 +1392,7 @@ int debug_dflt_header_fn(debug_info_t *id, struct debug_view *view,
 	else
 		except_str = "-";
 	caller = (unsigned long) entry->caller;
-	rc += sprintf(out_buf, "%02i %011ld:%06lu %1u %1s %02i %p  ",
+	rc += sprintf(out_buf, "%02i %011ld:%06lu %1u %1s %02i %pK  ",
 		      area, sec, usec, level, except_str,
 		      entry->id.fields.cpuid, (void *)caller);
 	return rc;

arch/s390/kernel/dis.c

View file

diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index 3be8297..b2c68fb 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Disassemble s390 instructions.
  *
@@ -396,9 +397,14 @@ struct s390_insn *find_insn(unsigned char *code)
 	unsigned char opfrag;
 	int i;
 
+	/* Search the opcode offset table to find an entry which

This diff is incomplete. Download the complete patch.