linux-kernel - linux-next: manual merge of the tip tree with the mips 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]

Message-Id: <20140115160608.5bf8571204de731b2c8d5e66@canb.auug.org.au>
Date:	Wed, 15 Jan 2014 16:06:08 +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>,
	Ralf Baechle <ralf@...ux-mips.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jayachandran C <jchandra@...adcom.com>,
	John Crispin <blogic@...nwrt.org>
Subject: linux-next: manual merge of the tip tree with the mips tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/mips/netlogic/xlp/setup.c between commit 8e4857962d97 ("MIPS:
Netlogic: Core wakeup improvements") from the mips tree and commit
7972e966b032 ("MIPS: Remove panic_timeout settings") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/mips/netlogic/xlp/setup.c
index c3af2d8772cf,54e75c77184b..000000000000
--- a/arch/mips/netlogic/xlp/setup.c
+++ b/arch/mips/netlogic/xlp/setup.c
@@@ -96,15 -92,6 +96,14 @@@ static void __init xlp_init_mem_from_ba
  
  void __init plat_mem_setup(void)
  {
 +#ifdef CONFIG_SMP
 +	nlm_wakeup_secondary_cpus();
 +
 +	/* update TLB size after waking up threads */
 +	current_cpu_data.tlbsize = ((read_c0_config6() >> 16) & 0xffff) + 1;
 +
 +	register_smp_ops(&nlm_smp_ops);
 +#endif
- 	panic_timeout	= 5;
  	_machine_restart = (void (*)(char *))nlm_linux_exit;
  	_machine_halt	= nlm_linux_exit;
  	pm_power_off	= nlm_linux_exit;

Content of type "application/pgp-signature" skipped