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

system can then trigger a SCSI dump by booting the SCSI disk, where zfcpdump

resides on.

The kernel part of zfcpdump is implemented as a debugfs file under "zcore/mem",

which exports memory and registers of the crashed Linux in an s390

standalone dump format. It can be used in the same way as e.g. /dev/mem. The

dump format defines a 4K header followed by plain uncompressed memory. The

register sets are stored in the prefix pages of the respective CPUs. To build a

dump enabled kernel with the zcore driver, the kernel config option

CONFIG_CRASH_DUMP has to be set. When reading from "zcore/mem", the part of

memory, which has been saved by hardware is read by the driver via the SCLP

hardware interface. The second part is just copied from the non overwritten real

memory.

Since kernel version 3.12 also the /proc/vmcore file can also be used to access

the dump.

The user space dump tool accesses the memory of the crashed system by means

of the /proc/vmcore interface. This interface exports the crashed system's

memory and registers in ELF core dump format. To access the memory which has

been saved by the hardware SCLP requests will be created at the time the data

is needed by /proc/vmcore. The tail part of the crashed systems memory which

has not been stashed by hardware can just be copied from real memory.

To build a dump enabled kernel the kernel config option CONFIG_CRASH_DUMP

has to be set.

To get a valid zfcpdump kernel configuration use "make zfcpdump_defconfig".

config PGTABLE_LEVELS

	int

	default 4 if 64BIT

	default 2

	default 4

source "init/Kconfig"

	  can be controlled through /sys/devices/system/cpu/cpu#.

	  Say N if you want to disable CPU hotplug.

config SCHED_SMT

	def_bool n

# Some NUMA nodes have memory ranges that span

# other nodes.	Even though a pfn is valid and

# between a node's start and end pfns, it may not

config NUMA

	bool "NUMA support"

	depends on SMP && 64BIT && SCHED_TOPOLOGY

	depends on SMP && SCHED_TOPOLOGY

	default n

	help

	  Enable NUMA support

endmenu

config SCHED_SMT

	def_bool n

config SCHED_MC

	def_bool n

drivers-$(CONFIG_OPROFILE)	+= arch/s390/oprofile/

boot		:= arch/s390/boot

tools		:= arch/s390/tools

all: image bzImage

archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

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

archprepare:

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

# Don't use tabs in echo arguments

define archhelp

  echo  '* image           - Kernel image for IPL ($(boot)/image)'

  echo	'* bzImage         - Compressed kernel image for IPL ($(boot)/bzImage)'

  echo	'  install         - Install kernel using'

  echo	'                    (your) ~/bin/$(INSTALLKERNEL) or'

  echo	'                    (distribution) /sbin/$(INSTALLKERNEL) or'

  echo	'                    install to $$(INSTALL_PATH)'

endef

CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_NUMA_BALANCING=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

CONFIG_CGROUP_HUGETLB=y

CONFIG_CGROUP_PERF=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_BLK_CGROUP=y

CONFIG_NAMESPACES=y

CONFIG_USER_NS=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_OPROFILE=m

CONFIG_KPROBES=y

CONFIG_JUMP_LABEL=y

CONFIG_STATIC_KEYS_SELFTEST=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y

CONFIG_HOTPLUG_PCI_S390=y

CONFIG_CHSC_SCH=y

CONFIG_CRASH_DUMP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

CONFIG_HIBERNATION=y

CONFIG_NET=y

CONFIG_TCP_CONG_VENO=m

CONFIG_TCP_CONG_YEAH=m

CONFIG_TCP_CONG_ILLINOIS=m

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_VIRTIO_BALLOON=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_JBD_DEBUG=y

CONFIG_JBD2_DEBUG=y

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y

CONFIG_QFMT_V1=m

CONFIG_QFMT_V2=m

CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_FRAME_WARN=1024

CONFIG_READABLE_ASM=y

CONFIG_UNUSED_SYMBOLS=y

CONFIG_HEADERS_CHECK=y

CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_PAGEALLOC=y

CONFIG_DEBUG_OBJECTS=y

CONFIG_FAIL_PAGE_ALLOC=y

CONFIG_FAIL_MAKE_REQUEST=y

CONFIG_FAIL_IO_TIMEOUT=y

CONFIG_FAIL_FUTEX=y

CONFIG_FAULT_INJECTION_DEBUG_FS=y

CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_LATENCYTOP=y

CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_NUMA_BALANCING=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

CONFIG_CGROUP_HUGETLB=y

CONFIG_CGROUP_PERF=y

CONFIG_BLK_CGROUP=y

CONFIG_NAMESPACES=y

CONFIG_USER_NS=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_OPROFILE=m

CONFIG_HOTPLUG_PCI_S390=y

CONFIG_CHSC_SCH=y

CONFIG_CRASH_DUMP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

CONFIG_HIBERNATION=y

CONFIG_NET=y

CONFIG_TCP_CONG_VENO=m

CONFIG_TCP_CONG_YEAH=m

CONFIG_TCP_CONG_ILLINOIS=m

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_VIRTIO_BALLOON=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_JBD_DEBUG=y

CONFIG_JBD2_DEBUG=y

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y

CONFIG_QFMT_V1=m

CONFIG_QFMT_V2=m

CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m

CONFIG_CPU_NOTIFIER_ERROR_INJECT=m

CONFIG_PM_NOTIFIER_ERROR_INJECT=m

CONFIG_LATENCYTOP=y

CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y

CONFIG_BLK_DEV_IO_TRACE=y

# CONFIG_KPROBE_EVENT is not set

CONFIG_LKDTM=m

CONFIG_INTERVAL_TREE_TEST=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_TEST_BPF=m

# CONFIG_STRICT_DEVMEM is not set

CONFIG_S390_PTDUMP=y

CONFIG_ENCRYPTED_KEYS=m