[PATCH 3/4] xen: move the xenvm machine to mach-virt

[Marc Zyngier]

On 21/03/13 19:16, Stefano Stabellini wrote:
> xenvm is based on mach-vexpress, move it to mach-virt.
> 
> Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
> CC: marc.zyngier at arm.com
> CC: will.deacon at arm.com
> CC: arnd at arndb.de
> CC: rob.herring at calxeda.com

Awesome!

Acked-by: Marc Zyngier <marc.zyngier at arm.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
>  };
>  
> 


-- 
Jazz is not dead. It just smells funny...