linux-next: manual merge of the tip tree with the mips tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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;

Attachment: pgp00000.pgp
Description: PGP signature