From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Apr 2015 03:51:44 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v4.1-rc1~130
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdfa54dfd9eea001274dbcd622657a904fe43b81;p=platform%2Fkernel%2Flinux-exynos.git

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

Pull s390 updates from Martin Schwidefsky:
 "The major change in this merge is the removal of the support for
  31-bit kernels.  Naturally 31-bit user space will continue to work via
  the compat layer.

  And then some cleanup, some improvements and bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (23 commits)
  s390/smp: wait until secondaries are active & online
  s390/hibernate: fix save and restore of kernel text section
  s390/cacheinfo: add missing facility check
  s390/syscalls: simplify syscall_get_arch()
  s390/irq: enforce correct irqclass_sub_desc array size
  s390: remove "64" suffix from mem64.S and swsusp_asm64.S
  s390/ipl: cleanup macro usage
  s390/ipl: cleanup shutdown_action attributes
  s390/ipl: cleanup bin attr usage
  s390/uprobes: fix address space annotation
  s390: add missing arch_release_task_struct() declaration
  s390: make couple of functions and variables static
  s390/maccess: improve s390_kernel_write()
  s390/maccess: remove potentially broken probe_kernel_write()
  s390/watchdog: support for KVM hypervisors and delete pr_info messages
  s390/watchdog: enable KEEPALIVE for /dev/watchdog
  s390/dasd: remove setting of scheduler from driver
  s390/traps: panic() instead of die() on translation exception
  s390: remove test_facility(2) (== z/Architecture mode active) checks
  s390/cmpxchg: simplify cmpxchg_double
  ...
---

bdfa54dfd9eea001274dbcd622657a904fe43b81
diff --cc arch/s390/Kconfig
index 6321fd8,1de26e1..a5ced5c
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -133,8 -132,7 +133,8 @@@ config S39
  	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_MEMBLOCK_PHYS_MAP
diff --cc arch/s390/kernel/asm-offsets.c
index 8dc4db1,6e94edd..f35058d
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@@ -166,12 -166,8 +166,9 @@@ int main(void
  	DEFINE(__LC_FPREGS_SAVE_AREA, offsetof(struct _lowcore, floating_pt_save_area));
  	DEFINE(__LC_GPREGS_SAVE_AREA, offsetof(struct _lowcore, gpregs_save_area));
  	DEFINE(__LC_CREGS_SAVE_AREA, offsetof(struct _lowcore, cregs_save_area));
- #ifdef CONFIG_32BIT
- 	DEFINE(SAVE_AREA_BASE, offsetof(struct _lowcore, extended_save_area_addr));
- #else /* CONFIG_32BIT */
  	DEFINE(__LC_DATA_EXC_CODE, offsetof(struct _lowcore, data_exc_code));
  	DEFINE(__LC_MCCK_FAIL_STOR_ADDR, offsetof(struct _lowcore, failing_storage_address));
 +	DEFINE(__LC_VX_SAVE_AREA_ADDR, offsetof(struct _lowcore, vector_save_area_addr));
  	DEFINE(__LC_EXT_PARAMS2, offsetof(struct _lowcore, ext_params2));
  	DEFINE(SAVE_AREA_BASE, offsetof(struct _lowcore, floating_pt_save_area));
  	DEFINE(__LC_PASTE, offsetof(struct _lowcore, paste));
diff --cc arch/s390/mm/mmap.c
index bb3367c,b68af05..6e552af
--- a/arch/s390/mm/mmap.c
+++ b/arch/s390/mm/mmap.c
@@@ -177,34 -179,17 +177,6 @@@ arch_get_unmapped_area_topdown(struct f
  	return addr;
  }
  
- #ifndef CONFIG_64BIT
- 
- /*
-  * This function, called very early during the creation of a new
-  * process VM image, sets up which VM layout function to use:
-  */
- void arch_pick_mmap_layout(struct mm_struct *mm)
 -unsigned long randomize_et_dyn(void)
--{
- 	unsigned long random_factor = 0UL;
- 
- 	if (current->flags & PF_RANDOMIZE)
- 		random_factor = arch_mmap_rnd();
 -	unsigned long base;
--
- 	/*
- 	 * Fall back to the standard layout if the personality
- 	 * bit is set, or if the expected stack growth is unlimited:
- 	 */
- 	if (mmap_is_legacy()) {
- 		mm->mmap_base = mmap_base_legacy(random_factor);
- 		mm->get_unmapped_area = arch_get_unmapped_area;
- 	} else {
- 		mm->mmap_base = mmap_base(random_factor);
- 		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
- 	}
 -	base = STACK_TOP / 3 * 2;
 -	if (!is_32bit_task())
 -		/* Align to 4GB */
 -		base &= ~((1UL << 32) - 1);
 -	return base + mmap_rnd();
--}
- 
- #else
--
  int s390_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
  {
  	if (is_compat_task() || (TASK_SIZE >= (1UL << 53)))