Commit f7b32e4c 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 more s390 updates from Martin Schwidefsky:

 - some cleanup for the hugetlbfs pte/pmd conversion functions

 - the code to check for the minimum CPU type is converted from
   assembler to C and an informational message is added in case the CPU
   is not new enough to run the kernel

 - bug fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/ftrace/jprobes: Fix conflict between jprobes and function graph tracing
  s390: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO
  s390/zcrypt: fix possible memory leak in ap_module_init()
  s390/numa: only set possible nodes within node_possible_map
  s390/als: fix compile with gcov enabled
  s390/facilities: do not generate DWORDS define anymore
  s390/als: print missing facilities on facility mismatch
  s390/als: print machine type on facility mismatch
  s390/als: convert architecture level set code to C
  s390/sclp: move uninitialized data to data section
  s390/zcrypt: Fix zcrypt suspend/resume behavior
  s390/cio: fix premature wakeup during chp configure
  s390/cio: convert cfg_lock mutex to spinlock
  s390/mm: clean up pte/pmd encoding
parents 731c7d3a e64a5470

arch/s390/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ KBUILD_CFLAGS += $(call cc-option,-ffreestanding) 


GCOV_PROFILE := n



OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o sclp.o ebcdic.o)

OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o sclp.o ebcdic.o als.o)

OBJECTS += $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o



LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup -T

arch/s390/include/asm/elf.h

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ do { \ 
#define MMAP_ALIGN_MASK	(is_compat_task() ? 0 : 0x7fUL)

#define STACK_RND_MASK	MMAP_RND_MASK



/* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */

#define ARCH_DLINFO							    \

do {									    \

	if (vdso_enabled)						    \

arch/s390/include/asm/pgtable.h

+10 −10
Original line number Diff line number Diff line
@@ -242,8 +242,8 @@ static inline int is_module_addr(void *addr) 
 * swap				.11..ttttt.0

 * prot-none, clean, old	.11.xx0000.1

 * prot-none, clean, young	.11.xx0001.1

 * prot-none, dirty, old	.10.xx0010.1

 * prot-none, dirty, young	.10.xx0011.1

 * prot-none, dirty, old	.11.xx0010.1

 * prot-none, dirty, young	.11.xx0011.1

 * read-only, clean, old	.11.xx0100.1

 * read-only, clean, young	.01.xx0101.1

 * read-only, dirty, old	.11.xx0110.1
@@ -323,8 +323,8 @@ static inline int is_module_addr(void *addr) 
#define _SEGMENT_ENTRY_DIRTY	0x2000	/* SW segment dirty bit */

#define _SEGMENT_ENTRY_YOUNG	0x1000	/* SW segment young bit */

#define _SEGMENT_ENTRY_LARGE	0x0400	/* STE-format control, large page */

#define _SEGMENT_ENTRY_READ	0x0002	/* SW segment read bit */

#define _SEGMENT_ENTRY_WRITE	0x0001	/* SW segment write bit */

#define _SEGMENT_ENTRY_WRITE	0x0002	/* SW segment write bit */

#define _SEGMENT_ENTRY_READ	0x0001	/* SW segment read bit */



#ifdef CONFIG_MEM_SOFT_DIRTY

#define _SEGMENT_ENTRY_SOFT_DIRTY 0x4000 /* SW segment soft dirty bit */
@@ -335,15 +335,15 @@ static inline int is_module_addr(void *addr) 
/*

 * Segment table and region3 table entry encoding

 * (R = read-only, I = invalid, y = young bit):

 *				dy..R...I...rw

 *				dy..R...I...wr

 * prot-none, clean, old	00..1...1...00

 * prot-none, clean, young	01..1...1...00

 * prot-none, dirty, old	10..1...1...00

 * prot-none, dirty, young	11..1...1...00

 * read-only, clean, old	00..1...1...10

 * read-only, clean, young	01..1...0...10

 * read-only, dirty, old	10..1...1...10

 * read-only, dirty, young	11..1...0...10

 * read-only, clean, old	00..1...1...01

 * read-only, clean, young	01..1...0...01

 * read-only, dirty, old	10..1...1...01

 * read-only, dirty, young	11..1...0...01

 * read-write, clean, old	00..1...1...11

 * read-write, clean, young	01..1...0...11

 * read-write, dirty, old	10..0...1...11
@@ -382,7 +382,7 @@ static inline int is_module_addr(void *addr) 
/*

 * Page protection definitions.

 */

#define PAGE_NONE	__pgprot(_PAGE_PRESENT | _PAGE_INVALID)

#define PAGE_NONE	__pgprot(_PAGE_PRESENT | _PAGE_INVALID | _PAGE_PROTECT)

#define PAGE_READ	__pgprot(_PAGE_PRESENT | _PAGE_READ | \

				 _PAGE_INVALID | _PAGE_PROTECT)

#define PAGE_WRITE	__pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \

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

+2 −0
Original line number Diff line number Diff line
@@ -3,4 +3,6 @@ 


#define AT_SYSINFO_EHDR		33



#define AT_VECTOR_SIZE_ARCH 1 /* entries in ARCH_DLINFO */



#endif

arch/s390/kernel/Makefile

+8 −3
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


KCOV_INSTRUMENT_early.o := n

KCOV_INSTRUMENT_sclp.o := n

KCOV_INSTRUMENT_als.o := n



ifdef CONFIG_FUNCTION_TRACER

# Don't trace early setup code and tracing code
@@ -32,21 +33,25 @@ CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' 
CFLAGS_sysinfo.o += -w



#

# Use -march=z900 for sclp.c to be able to print an error message if

# the kernel is started on a machine which is too old

# Use -march=z900 for sclp.c and als.c to be able to print an error

# message if the kernel is started on a machine which is too old

#

CFLAGS_REMOVE_sclp.o = $(CC_FLAGS_FTRACE)

CFLAGS_REMOVE_als.o = $(CC_FLAGS_FTRACE)

ifneq ($(CC_FLAGS_MARCH),-march=z900)

CFLAGS_REMOVE_sclp.o	+= $(CC_FLAGS_MARCH)

CFLAGS_sclp.o		+= -march=z900

CFLAGS_REMOVE_als.o	+= $(CC_FLAGS_MARCH)

CFLAGS_als.o		+= -march=z900

AFLAGS_REMOVE_head.o	+= $(CC_FLAGS_MARCH)

AFLAGS_head.o		+= -march=z900

endif

GCOV_PROFILE_sclp.o := n

GCOV_PROFILE_als.o := n



obj-y	:= traps.o time.o process.o base.o early.o setup.o idle.o vtime.o

obj-y	+= processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o

obj-y	+= debug.o irq.o ipl.o dis.o diag.o sclp.o vdso.o

obj-y	+= debug.o irq.o ipl.o dis.o diag.o sclp.o vdso.o als.o

obj-y	+= sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o

obj-y	+= runtime_instr.o cache.o fpu.o dumpstack.o

obj-y	+= entry.o reipl.o relocate_kernel.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE