Commit ca0c836d 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 updates from Martin Schwidefsky:
 "Bug fixes, small improvements and one notable change: the system call
  table and the unistd.h header are now generated automatically with a
  shell script from a text file"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/decompressor: discard __ksymtab and .eh_frame sections
  s390: fix handling of -1 in set{,fs}[gu]id16 syscalls
  s390/tools: generate header files in arch/s390/include/generated/
  s390/syscalls: use generated syscall_table.h and unistd.h header files
  s390/syscalls: add Makefile to generate system call header files
  s390/syscalls: add syscalltbl script
  s390/syscalls: add system call table
  s390/decompressor: swap .text and .rodata.compressed sections
  s390/sclp: fix .data section specification
  s390/ipl: avoid usage of __section(.data)
  s390/head: replace hard coded values with constants
  s390/disassembler: add generated gen_opcode_table tool to .gitignore
  s390: remove bogus system call table entries
  s390/kprobes: remove duplicate includes
  s390/dasd: Remove dead return code checks
  s390/dasd: Simplify code
  s390/vdso: revise CFI annotations of vDSO functions
  s390/kernel: emit CFI data in .debug_frame and discard .eh_frame sections
parents 255442c9 47d67fac

arch/s390/Makefile

+11 −3
Original line number Diff line number Diff line
@@ -88,9 +88,13 @@ KBUILD_CFLAGS += -DCC_USING_HOTPATCH 
endif

endif



# Test CFI features of binutils

cfi := $(call as-instr,.cfi_startproc\n.cfi_val_offset 15$(comma)-160\n.cfi_endproc,-DCONFIG_AS_CFI_VAL_OFFSET=1)



KBUILD_CFLAGS	+= -mbackchain -msoft-float $(cflags-y)

KBUILD_CFLAGS	+= -pipe -fno-strength-reduce -Wno-sign-compare

KBUILD_AFLAGS	+= $(aflags-y)

KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables $(cfi)

KBUILD_AFLAGS	+= $(aflags-y) $(cfi)



OBJCOPYFLAGS	:= -O binary
@@ -107,6 +111,7 @@ drivers-y += drivers/s390/ 
drivers-$(CONFIG_OPROFILE)	+= arch/s390/oprofile/



boot		:= arch/s390/boot

syscalls	:= arch/s390/kernel/syscalls

tools		:= arch/s390/tools



all: image bzImage
@@ -128,9 +133,12 @@ archclean: 
	$(Q)$(MAKE) $(clean)=$(boot)

	$(Q)$(MAKE) $(clean)=$(tools)



archheaders:

	$(Q)$(MAKE) $(build)=$(syscalls) uapi



archprepare:

	$(Q)$(MAKE) $(build)=$(tools) include/generated/facilities.h

	$(Q)$(MAKE) $(build)=$(tools) include/generated/dis.h

	$(Q)$(MAKE) $(build)=$(syscalls) kapi

	$(Q)$(MAKE) $(build)=$(tools) kapi



# Don't use tabs in echo arguments

define archhelp

arch/s390/boot/compressed/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ targets += misc.o piggy.o sizes.h head.o 
KBUILD_CFLAGS := -m64 -D__KERNEL__ -O2

KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY

KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -msoft-float

KBUILD_CFLAGS += -fno-asynchronous-unwind-tables

KBUILD_CFLAGS += $(call cc-option,-mpacked-stack)

KBUILD_CFLAGS += $(call cc-option,-ffreestanding)

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

+9 −3
Original line number Diff line number Diff line
@@ -17,15 +17,15 @@ SECTIONS 
		HEAD_TEXT

		_ehead = . ;

	}

	.rodata.compressed : {

		*(.rodata.compressed)

	}

	.text :	{

		_text = .;	/* Text */

		*(.text)

		*(.text.*)

		_etext = . ;

	}

	.rodata.compressed : {

		*(.rodata.compressed)

	}

	.rodata : {

		_rodata = . ;

		*(.rodata)	 /* read-only data */
@@ -48,4 +48,10 @@ SECTIONS 
		_ebss = .;

	}

	_end = .;



	/* Sections to be discarded */

	/DISCARD/ : {

		*(.eh_frame)

		*(*__ksymtab*)

	}

}

arch/s390/include/asm/Kbuild

+5 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generated-y += dis-defs.h

generated-y += facility-defs.h

generated-y += syscall_table.h

generated-y += unistd_nr.h



generic-y += asm-offsets.h

generic-y += cacheflush.h

generic-y += clkdev.h

arch/s390/include/asm/dis.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#ifndef __ASM_S390_DIS_H__

#define __ASM_S390_DIS_H__



#include <generated/dis.h>

#include <asm/dis-defs.h>



static inline int insn_length(unsigned char code)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE