Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
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
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 --]

             reply index

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-02 11:52 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-03-26 22:27 Stephen Rothwell
2020-03-27 13:18 ` Thierry Reding
2020-03-27 13:50   ` Arnd Bergmann
2019-06-25  0:12 Stephen Rothwell
2015-12-02 11:46 Mark Brown
2013-03-18  4:31 Stephen Rothwell
2013-03-18 15:23 ` Stephen Warren
2013-03-18 15:49   ` Arnd Bergmann
2013-02-02 11:45 Stephen Rothwell
2013-01-23  5:30 Stephen Rothwell
2013-01-23  5:25 Stephen Rothwell
2013-01-16  3:14 Stephen Rothwell
2013-01-16  3:49 ` Tony Prisk
2013-01-16  4:32   ` Stephen Warren
2013-01-16  4:52     ` Tony Prisk
2013-01-16 16:27       ` Olof Johansson
2013-01-16 17:08         ` Stephen Warren
2013-01-16 17:35           ` Olof Johansson
2013-01-16  3:10 Stephen Rothwell
2013-01-16  3:12 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130202225233.ee33af6d25a42239ae542ebd@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=ccross@android.com \
    --cc=hdoyu@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=pgaikwad@nvidia.com \
    --cc=rob.herring@calxeda.com \
    --cc=swarren@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git