From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 May 2013 22:11:43 +0000 (-0700)
Subject: Merge tag '3.9-rc3-smp-6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabe... 
X-Git-Tag: v3.12-rc1~864
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d75e2f902318cc20f3218e6823fe5463a8126bde;p=kernel%2Fkernel-generic.git

Merge tag '3.9-rc3-smp-6-tag' of git://git./linux/kernel/git/sstabellini/xen

Pull ARM Xen SMP updates from Stefano Stabellini:
 "This contains a bunch of Xen/ARM specific changes, including some
  fixes, SMP support for Xen on ARM, and moving the xenvm machine from
  mach-vexpress to mach-virt.

  The non-Xen files that are touched are arch/arm/Kconfig, to select
  ARM_PSCI on XEN, and arch/arm/boot/dts/Makefile, to build the xenvm
  DTB if CONFIG_ARCH_VIRT.

  Highlights:

   - Move xenvm to mach-virt.

   - Implement SMP support in Xen on ARM.

   - Add support for machine reboot and power off via Xen hypercalls"

* tag '3.9-rc3-smp-6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen:
  xen/arm: remove duplicated include from enlighten.c
  xen/arm: use sched_op hypercalls for machine reboot and power off
  xenvm: add a simple PSCI node and a second cpu
  xen/arm: XEN selects ARM_PSCI
  xen: move the xenvm machine to mach-virt
  xen/arm: SMP support
  xen/arm: implement HYPERVISOR_vcpu_op
  xen/arm: actually pass a non-NULL percpu pointer to request_percpu_irq
---

d75e2f902318cc20f3218e6823fe5463a8126bde
diff --cc arch/arm/mach-virt/virt.c
index adc0945,528c05e..061f283
--- a/arch/arm/mach-virt/virt.c
+++ b/arch/arm/mach-virt/virt.c
@@@ -30,8 -32,15 +30,9 @@@ static void __init virt_init(void
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  }
  
 -static void __init virt_timer_init(void)
 -{
 -	WARN_ON(arch_timer_of_register() != 0);
 -	WARN_ON(arch_timer_sched_clock_init() != 0);
 -}
 -
  static const char *virt_dt_match[] = {
  	"linux,dummy-virt",
+ 	"xen,xenvm",
  	NULL
  };