linux-kernel - linux-next: manual merge of the tip tree with the s390 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed, 14 Mar 2012 14:46:33 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>
Subject: linux-next: manual merge of the tip tree with the s390 tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/s390/kernel/smp.c between commit 8b646bd75908 ("[S390] rework smp
code") from the s390 tree and commit 5fbd036b552f ("sched: Cleanup
cpu_active madness") from the tip tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/s390/kernel/smp.c
index 64ebbcb,b0e28c4..0000000
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@@ -714,12 -544,12 +714,6 @@@ static void __cpuinit smp_start_seconda
  	ipi_call_lock();
  	set_cpu_online(smp_processor_id(), true);
  	ipi_call_unlock();
- 	/*
- 	 * 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();
 -	__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 */
  	local_irq_enable();
  	/* cpu_idle will call schedule for us */
  	cpu_idle();

Content of type "application/pgp-signature" skipped