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

obj-$(CONFIG_CRYPTO_HW)		+= crypto/

obj-$(CONFIG_S390_HYPFS_FS)	+= hypfs/

obj-$(CONFIG_APPLDATA_BASE)	+= appldata/

obj-$(CONFIG_MATHEMU)		+= math-emu/

obj-y				+= net/

obj-$(CONFIG_PCI)		+= pci/

	def_bool y

config ARCH_DMA_ADDR_T_64BIT

	def_bool 64BIT

	def_bool y

config GENERIC_LOCKBREAK

	def_bool y if SMP && PREEMPT

	def_bool n

config ARCH_SUPPORTS_UPROBES

	def_bool 64BIT

	def_bool y

config S390

	def_bool y

	select GENERIC_TIME_VSYSCALL

	select HAVE_ALIGNED_STRUCT_PAGE if SLUB

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_JUMP_LABEL if !MARCH_G5

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT

	select HAVE_BPF_JIT if 64BIT && PACK_STACK

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE

	select HAVE_BPF_JIT if PACK_STACK

	select HAVE_CMPXCHG_DOUBLE

	select HAVE_CMPXCHG_LOCAL

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DYNAMIC_FTRACE if 64BIT

	select HAVE_DYNAMIC_FTRACE_WITH_REGS if 64BIT

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER if 64BIT

	select HAVE_FUNCTION_TRACER if 64BIT

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_XZ

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_KVM if 64BIT

	select HAVE_KVM

	select HAVE_LIVEPATCH

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_PERF_EVENTS

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_UID16 if 32BIT

	select HAVE_VIRT_CPU_ACCOUNTING

	select MODULES_USE_ELF_RELA

	select NO_BOOTMEM

choice

	prompt "Processor type"

	default MARCH_G5

config MARCH_G5

	bool "System/390 model G5 and G6"

	depends on !64BIT

	help

	  Select this to build a 31 bit kernel that works

	  on all ESA/390 and z/Architecture machines.

	default MARCH_Z900

config MARCH_Z900

	bool "IBM zSeries model z800 and z900"

	select HAVE_MARCH_Z900_FEATURES if 64BIT

	select HAVE_MARCH_Z900_FEATURES

	help

	  Select this to enable optimizations for model z800/z900 (2064 and

	  2066 series). This will enable some optimizations that are not

config MARCH_Z990

	bool "IBM zSeries model z890 and z990"

	select HAVE_MARCH_Z990_FEATURES if 64BIT

	select HAVE_MARCH_Z990_FEATURES

	help

	  Select this to enable optimizations for model z890/z990 (2084 and

	  2086 series). The kernel will be slightly faster but will not work

config MARCH_Z9_109

	bool "IBM System z9"

	select HAVE_MARCH_Z9_109_FEATURES if 64BIT

	select HAVE_MARCH_Z9_109_FEATURES

	help

	  Select this to enable optimizations for IBM System z9 (2094 and

	  2096 series). The kernel will be slightly faster but will not work

config MARCH_Z10

	bool "IBM System z10"

	select HAVE_MARCH_Z10_FEATURES if 64BIT

	select HAVE_MARCH_Z10_FEATURES

	help

	  Select this to enable optimizations for IBM System z10 (2097 and

	  2098 series). The kernel will be slightly faster but will not work

config MARCH_Z196

	bool "IBM zEnterprise 114 and 196"

	select HAVE_MARCH_Z196_FEATURES if 64BIT

	select HAVE_MARCH_Z196_FEATURES

	help

	  Select this to enable optimizations for IBM zEnterprise 114 and 196

	  (2818 and 2817 series). The kernel will be slightly faster but will

config MARCH_ZEC12

	bool "IBM zBC12 and zEC12"

	select HAVE_MARCH_ZEC12_FEATURES if 64BIT

	select HAVE_MARCH_ZEC12_FEATURES

	help

	  Select this to enable optimizations for IBM zBC12 and zEC12 (2828 and

	  2827 series). The kernel will be slightly faster but will not work on

config MARCH_Z13

	bool "IBM z13"

	select HAVE_MARCH_Z13_FEATURES if 64BIT

	select HAVE_MARCH_Z13_FEATURES

	help

	  Select this to enable optimizations for IBM z13 (2964 series).

	  The kernel will be slightly faster but will not work on older

endchoice

config MARCH_G5_TUNE

	def_bool TUNE_G5 || MARCH_G5 && TUNE_DEFAULT

config MARCH_Z900_TUNE

	def_bool TUNE_Z900 || MARCH_Z900 && TUNE_DEFAULT

	  Tune the generated code for the target processor for which the kernel

	  will be compiled.

config TUNE_G5

	bool "System/390 model G5 and G6"

config TUNE_Z900

	bool "IBM zSeries model z800 and z900"

config 64BIT

	def_bool y

	prompt "64 bit kernel"

	help

	  Select this option if you have an IBM z/Architecture machine

	  and want to use the 64 bit addressing mode.

config 32BIT

	def_bool y if !64BIT

config COMPAT

	def_bool y

	prompt "Kernel support for 31 bit emulation"

	depends on 64BIT

	select COMPAT_BINFMT_ELF if BINFMT_ELF

	select ARCH_WANT_OLD_COMPAT_IPC

	select COMPAT_OLD_SIGACTION

	int "Maximum number of CPUs (2-512)"

	range 2 512

	depends on SMP

	default "32" if !64BIT

	default "64" if 64BIT

	default "64"

	help

	  This allows you to specify the maximum number of CPUs which this

	  kernel will support. The maximum supported value is 512 and the

source kernel/Kconfig.preempt

config MATHEMU

	def_bool y

	prompt "IEEE FPU emulation"

	depends on MARCH_G5

	help

	  This option is required for IEEE compliant floating point arithmetic

	  on older ESA/390 machines. Say Y unless you know your machine doesn't

	  need this.

source kernel/Kconfig.hz

endmenu

	def_bool y

	select SPARSEMEM_VMEMMAP_ENABLE

	select SPARSEMEM_VMEMMAP

	select SPARSEMEM_STATIC if !64BIT

config ARCH_SPARSEMEM_DEFAULT

	def_bool y

config ARCH_ENABLE_SPLIT_PMD_PTLOCK

	def_bool y

	depends on 64BIT

config FORCE_MAX_ZONEORDER

	int

menuconfig PCI

	bool "PCI support"

	depends on 64BIT

	select HAVE_DMA_ATTRS

	select PCI_MSI

	help

config SCM_BUS

	def_bool y

	depends on 64BIT

	prompt "SCM bus driver"

	help

	  Bus driver for Storage Class Memory.

config CRASH_DUMP

	bool "kernel crash dumps"

	depends on 64BIT && SMP

	depends on SMP

	select KEXEC

	help

	  Generate crash dump after being started by kexec.

menu "Power Management"

config ARCH_HIBERNATION_POSSIBLE

	def_bool y if 64BIT

	def_bool y

source "kernel/power/Kconfig"

config S390_GUEST

	def_bool y

	prompt "s390 support for virtio devices"

	depends on 64BIT

	select TTY

	select VIRTUALIZATION

	select VIRTIO

# Copyright (C) 1994 by Linus Torvalds

#

ifndef CONFIG_64BIT

LD_BFD		:= elf32-s390

LDFLAGS		:= -m elf_s390

KBUILD_CFLAGS	+= -m31

KBUILD_AFLAGS	+= -m31

UTS_MACHINE	:= s390

STACK_SIZE	:= 8192

CHECKFLAGS	+= -D__s390__ -msize-long

else

LD_BFD		:= elf64-s390

LDFLAGS		:= -m elf64_s390

KBUILD_AFLAGS_MODULE += -fPIC

UTS_MACHINE	:= s390x

STACK_SIZE	:= 16384

CHECKFLAGS	+= -D__s390__ -D__s390x__

endif

export LD_BFD

mflags-$(CONFIG_MARCH_G5)     := -march=g5

mflags-$(CONFIG_MARCH_Z900)   := -march=z900

mflags-$(CONFIG_MARCH_Z990)   := -march=z990

mflags-$(CONFIG_MARCH_Z9_109) := -march=z9-109

aflags-y += $(mflags-y)

cflags-y += $(mflags-y)

cflags-$(CONFIG_MARCH_G5_TUNE)		+= -mtune=g5

cflags-$(CONFIG_MARCH_Z900_TUNE)	+= -mtune=z900

cflags-$(CONFIG_MARCH_Z990_TUNE)	+= -mtune=z990

cflags-$(CONFIG_MARCH_Z9_109_TUNE)	+= -mtune=z9-109

OBJCOPYFLAGS	:= -O binary

head-y		:= arch/s390/kernel/head.o

head-y		+= arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o)

head-y		+= arch/s390/kernel/head64.o

# See arch/s390/Kbuild for content of core part of the kernel

core-y		+= arch/s390/

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

vdso_install:

ifeq ($(CONFIG_64BIT),y)

	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@

endif

	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@

archclean:

# create a compressed vmlinux image from the original vmlinux

#

BITS := $(if $(CONFIG_64BIT),64,31)

targets	:= vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2

targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4

targets += misc.o piggy.o sizes.h head$(BITS).o

targets += misc.o piggy.o sizes.h head.o

KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2

KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUX_INCLUDE) -O2

KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING

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

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

GCOV_PROFILE := n

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

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

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

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

$(obj)/vmlinux: $(obj)/vmlinux.lds $(OBJECTS)

$(obj)/sizes.h: vmlinux

	$(call if_changed,sizes)

AFLAGS_head$(BITS).o += -I$(obj)

$(obj)/head$(BITS).o: $(obj)/sizes.h

AFLAGS_head.o += -I$(obj)

$(obj)/head.o: $(obj)/sizes.h

CFLAGS_misc.o += -I$(obj)

$(obj)/misc.o: $(obj)/sizes.h