From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Mar 2012 01:15:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v3.4-rc1~135
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=db1417967959569599da2a4bd0ffb93b17ad795f;p=~emulex%2Finfiniband.git

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

Pull s390 patches from Martin Schwidefsky:
 "The biggest patch is the rework of the smp code, something I wanted to
  do for some time.  There are some patches for our various dump methods
  and one new thing: z/VM LGR detection.  LGR stands for linux-guest-
  relocation and is the guest migration feature of z/VM.  For debugging
  purposes we keep a log of the systems where a specific guest has lived."

Fix up trivial conflict in arch/s390/kernel/smp.c due to the scheduler
cleanup having removed some code next to removed s390 code.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  [S390] kernel: Pass correct stack for smp_call_ipl_cpu()
  [S390] Ensure that vmcore_info pointer is never accessed directly
  [S390] dasd: prevent validate server for offline devices
  [S390] Remove monolithic build option for zcrypt driver.
  [S390] stack dump: fix indentation in output
  [S390] kernel: Add OS info memory interface
  [S390] Use block_sigmask()
  [S390] kernel: Add z/VM LGR detection
  [S390] irq: external interrupt code passing
  [S390] irq: set __ARCH_IRQ_EXIT_IRQS_DISABLED
  [S390] zfcpdump: Implement async sdias event processing
  [S390] Use copy_to_absolute_zero() instead of "stura/sturg"
  [S390] rework idle code
  [S390] rework smp code
  [S390] rename lowcore field
  [S390] Fix gcc 4.6.0 compile warning
---

db1417967959569599da2a4bd0ffb93b17ad795f
diff --cc arch/s390/kernel/smp.c
index b0e28c47ab8,64ebbcbb31e..a8bf9994b08
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@@ -544,12 -714,12 +714,6 @@@ static void __cpuinit smp_start_seconda
  	ipi_call_lock();
  	set_cpu_online(smp_processor_id(), true);
  	ipi_call_unlock();
- 	__ctl_clear_bit(0, 28); /* Disable lowcore protection */
- 	S390_lowcore.restart_psw.mask =
- 		PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA | PSW_MASK_BA;
- 	S390_lowcore.restart_psw.addr =
- 		PSW_ADDR_AMODE | (unsigned long) psw_restart_int_handler;
- 	__ctl_set_bit(0, 28); /* Enable lowcore protection */
 -	/*
 -	 * Wait until the cpu which brought this one up marked it
 -	 * active before enabling interrupts.
 -	 */
 -	while (!cpumask_test_cpu(smp_processor_id(), cpu_active_mask))
 -		cpu_relax();
  	local_irq_enable();
  	/* cpu_idle will call schedule for us */
  	cpu_idle();