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

	select HAVE_KERNEL_XZ

	select HAVE_ARCH_MUTEX_CPU_RELAX

	select HAVE_ARCH_JUMP_LABEL if !MARCH_G5

	select HAVE_RCU_TABLE_FREE if SMP

	select ARCH_SAVE_PAGE_KEYS if HIBERNATION

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_TASKSTATS=y

CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_AUDIT=y

CONFIG_RCU_TRACE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_BLK_CGROUP=y

CONFIG_NAMESPACES=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_RD_BZIP2=y

CONFIG_RD_LZMA=y

CONFIG_RD_XZ=y

CONFIG_RD_LZO=y

CONFIG_EXPERT=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_DEFAULT_DEADLINE=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BINFMT_MISC=m

CONFIG_CMM=m

CONFIG_HZ_100=y

CONFIG_KEXEC=y

CONFIG_PM=y

CONFIG_CRASH_DUMP=y

CONFIG_HIBERNATION=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_NET_KEY=y

CONFIG_AFIUCV=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y

CONFIG_NET_SCTPPROBE=m

CONFIG_L2TP=m

CONFIG_L2TP_DEBUGFS=m

CONFIG_VLAN_8021Q=y

CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_ZFCP=y

CONFIG_ZFCP_DIF=y

CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_BONDING=m

CONFIG_DUMMY=m

CONFIG_EQUALIZER=m

CONFIG_TUN=m

CONFIG_NET_ETHERNET=y

CONFIG_VIRTIO_NET=y

CONFIG_RAW_DRIVER=m

CONFIG_VIRTIO_BALLOON=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_DLM=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_TIMER_STATS=y

CONFIG_PROVE_LOCKING=y

CONFIG_PROVE_RCU=y

CONFIG_LOCK_STAT=y

CONFIG_DEBUG_LOCKDEP=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_LIST=y

CONFIG_DEBUG_NOTIFIERS=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_RCU_TRACE=y

CONFIG_KPROBES_SANITY_TEST=y

CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y

CONFIG_CPU_NOTIFIER_ERROR_INJECT=m

CONFIG_LATENCYTOP=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_DEBUG_PAGEALLOC=y

# CONFIG_FTRACE is not set

CONFIG_BLK_DEV_IO_TRACE=y

# CONFIG_STRICT_DEVMEM is not set

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRC7=m

CONFIG_VIRTIO_BALLOON=y

	unsigned long nr;

	preempt_disable();

	S390_lowcore.stfl_fac_list = 0;

	asm volatile(

		"	.insn s,0xb2b10000,0(0)\n" /* stfl */

		"0:\n"

		EX_TABLE(0b, 0b)

		: "=m" (S390_lowcore.stfl_fac_list));

		: "+m" (S390_lowcore.stfl_fac_list));

	nr = 4; /* bytes stored by stfl */

	memcpy(stfle_fac_list, &S390_lowcore.stfl_fac_list, 4);

	if (S390_lowcore.stfl_fac_list & 0x01000000) {

unsigned long *page_table_alloc(struct mm_struct *, unsigned long);

void page_table_free(struct mm_struct *, unsigned long *);

#ifdef CONFIG_HAVE_RCU_TABLE_FREE

void page_table_free_rcu(struct mmu_gather *, unsigned long *);

void __tlb_remove_table(void *_table);

#endif

static inline void clear_table(unsigned long *s, unsigned long val, size_t n)

{

	asm volatile(

#ifndef __s390x__

		"	icm	%0,2,%O+1(%R1)\n"

		"	icm	%0,2,%O1+1(%R1)\n"

		"	ic	%0,%1\n"

		: "=&d" (result) : "Q" (*x) : "cc");

#else /* __s390x__ */