linux-next: manual merge of the tegra tree with the arm-soc tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Stephen Warren <swarren@nvidia.com>,
	Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Rob Herring <rob.herring@calxeda.com>,
	Hiroshi Doyu <hdoyu@nvidia.com>,
	Prashant Gaikwad <pgaikwad@nvidia.com>
Subject: linux-next: manual merge of the tegra tree with the arm-soc tree
Date: Sat, 2 Feb 2013 22:52:33 +1100	[thread overview]
Message-ID: <20130202225233.ee33af6d25a42239ae542ebd@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1835 bytes --]

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/platsmp.c between commits b1cffebf1029 ("ARM: GIC:
remove direct use of gic_raise_softirq") and 520f7bd73354 ("irqchip: Move
ARM gic.h to include/linux/irqchip/arm-gic.h") from the arm-soc tree and
commits 89572c77cdff ("ARM: tegra: move tegra_cpu_car.h to
linux/clk/tegra.h") and a8a6930157e0 ("ARM: tegra: Use DT /cpu node to
detect number of CPU core") from the tegra tree.

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

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

diff --cc arch/arm/mach-tegra/platsmp.c
index 18d7290,2ff68a4..0000000

--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@@ -18,11 -18,13 +18,13 @@@
  #include <linux/jiffies.h>
  #include <linux/smp.h>
  #include <linux/io.h>
 +#include <linux/irqchip/arm-gic.h>
+ #include <linux/clk/tegra.h>
  
  #include <asm/cacheflush.h>
 -#include <asm/hardware/gic.h>
  #include <asm/mach-types.h>
  #include <asm/smp_scu.h>
+ #include <asm/smp_plat.h>
  
  #include <mach/powergate.h>
  
@@@ -143,22 -176,9 +176,8 @@@ done
  	return status;
  }
  
- /*
-  * Initialise the CPU possible map early - this describes the CPUs
-  * which may be present or become present in the system.
-  */
  static void __init tegra_smp_init_cpus(void)
  {
- 	unsigned int i, ncores = scu_get_core_count(scu_base);
- 
- 	if (ncores > nr_cpu_ids) {
- 		pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",
- 			ncores, nr_cpu_ids);
- 		ncores = nr_cpu_ids;
- 	}
- 
- 	for (i = 0; i < ncores; i++)
- 		set_cpu_possible(i, true);
 -	set_smp_cross_call(gic_raise_softirq);
  }
  
  static void __init tegra_smp_prepare_cpus(unsigned int max_cpus)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
