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

Commit 4e3ab74c 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:
 "Among the usual minor bug fixes the more interesting patches are the
  perf counters for the latest machine, the missing select to enable
  transparent huge pages and a build fix for the UAPI rework."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390,uapi: do not use uapi/asm-generic/kvm_para.h
  s390/cache: fix data/instruction cache output
  s390: fix linker script for 31 bit builds
  s390/thp: select HAVE_ARCH_TRANSPARENT_HUGEPAGE
  s390/kdump: Use 64 bit mode for 0x10000 entry point
  perf_cpum_cf: Add support for counters available with IBM zEC12
  s390/css: stop stsch loop after cc 3
  s390/cio: use generic bitmap functions
  s390/chpid: make headers usable (again)
parents 4a09cbce fd2c32a9

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ config S390 
	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE

	select HAVE_UID16 if 32BIT

	select ARCH_WANT_IPC_PARSE_VERSION

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL_OLD

	select GENERIC_CLOCKEVENTS

arch/s390/boot/compressed/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390") 
OUTPUT_ARCH(s390:64-bit)

#else

OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390")

OUTPUT_ARCH(s390)

OUTPUT_ARCH(s390:31-bit)

#endif



ENTRY(startup)

arch/s390/include/asm/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <asm/cpu_mf.h>



/* CPU-measurement counter facility */

#define PERF_CPUM_CF_MAX_CTR		160

#define PERF_CPUM_CF_MAX_CTR		256



/* Per-CPU flags for PMU states */

#define PMU_F_RESERVED			0x1000

arch/s390/include/uapi/asm/Kbuild

+0 −2
Original line number Diff line number Diff line 
# UAPI Header export list

include include/uapi/asm-generic/Kbuild.asm



generic-y += kvm_para.h



header-y += auxvec.h

header-y += bitsperlong.h

header-y += byteorder.h

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

+5 −5
Original line number Diff line number Diff line 
/*

 *    Copyright IBM Corp. 2007

 *    Copyright IBM Corp. 2007, 2012

 *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>

 */
@@ -12,10 +12,10 @@ 
#define __MAX_CHPID 255



struct chp_id {

	u8 reserved1;

	u8 cssid;

	u8 reserved2;

	u8 id;

	__u8 reserved1;

	__u8 cssid;

	__u8 reserved2;

	__u8 id;

} __attribute__((packed));