linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: <xen-devel@lists.xensource.com>
Cc: <linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<Stefano.Stabellini@eu.citrix.com>, <konrad.wilk@oracle.com>,
	<Ian.Campbell@citrix.com>,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
	<will.deacon@arm.com>, <arnd@arndb.de>, <rob.herring@calxeda.com>
Subject: [PATCH v2 3/6] xen: move the xenvm machine to mach-virt
Date: Tue, 26 Mar 2013 14:41:12 +0000	[thread overview]
Message-ID: <1364308875-26484-3-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1303261423530.4430@kaball.uk.xensource.com>

xenvm is based on mach-vexpress, move it to mach-virt.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
CC: will.deacon@arm.com
CC: arnd@arndb.de
CC: rob.herring@calxeda.com
---
 arch/arm/mach-vexpress/v2m.c |    1 -
 arch/arm/mach-virt/virt.c    |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 915683c..c43ec78 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -469,7 +469,6 @@ static void __init v2m_dt_init(void)
 
 static const char * const v2m_dt_match[] __initconst = {
 	"arm,vexpress",
-	"xen,xenvm",
 	NULL,
 };
 
diff --git a/arch/arm/mach-virt/virt.c b/arch/arm/mach-virt/virt.c
index 31666f6..528c05e 100644
--- a/arch/arm/mach-virt/virt.c
+++ b/arch/arm/mach-virt/virt.c
@@ -40,6 +40,7 @@ static void __init virt_timer_init(void)
 
 static const char *virt_dt_match[] = {
 	"linux,dummy-virt",
+	"xen,xenvm",
 	NULL
 };
 
-- 
1.7.2.5


  parent reply	other threads:[~2013-03-26 14:41 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-26 14:40 [PATCH v2 0/6] xen/arm: move to mach-virt and support SMP Stefano Stabellini
2013-03-26 14:41 ` [PATCH v2 1/6] xen/arm: actually pass a non-NULL percpu pointer to request_percpu_irq Stefano Stabellini
2013-03-26 14:41 ` [PATCH v2 2/6] xen/arm: SMP support Stefano Stabellini
2013-03-26 14:41 ` Stefano Stabellini [this message]
2013-03-26 14:41 ` [PATCH v2 4/6] xen/arm: implement HYPERVISOR_vcpu_op Stefano Stabellini
2013-03-26 14:41 ` [PATCH v2 5/6] xenvm: add a simple PSCI node and a second cpu Stefano Stabellini
2013-03-26 15:00   ` Arnd Bergmann
2013-03-26 16:39     ` Stefano Stabellini
2013-03-26 14:41 ` [PATCH v2 6/6] [RFC] arm: use PSCI if available Stefano Stabellini
2013-03-26 14:58   ` Arnd Bergmann
2013-03-26 15:09     ` Stefano Stabellini
2013-03-26 15:04   ` Will Deacon
2013-03-26 15:25     ` Stefano Stabellini
2013-03-26 15:37       ` Will Deacon
2013-03-26 15:46         ` Arnd Bergmann
2013-03-26 15:55           ` Stefano Stabellini
2013-03-26 16:03           ` Nicolas Pitre
2013-03-27 11:15             ` Stefano Stabellini
2013-03-26 15:49         ` Stefano Stabellini
2013-03-26 16:01         ` Nicolas Pitre

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=1364308875-26484-3-git-send-email-stefano.stabellini@eu.citrix.com \
    --to=stefano.stabellini@eu.citrix.com \
    --cc=Ian.Campbell@citrix.com \
    --cc=arnd@arndb.de \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rob.herring@calxeda.com \
    --cc=will.deacon@arm.com \
    --cc=xen-devel@lists.xensource.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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).