From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 28 Nov 2012 19:43:44 +0000 (-0500)
Subject: Merge branch 'stable/pvh.v6.1' into linux-next
X-Git-Tag: next-20121205~35^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ca63454c05deabcfcd44b5dde7b9344b811061a8;p=karo-tx-linux.git

Merge branch 'stable/pvh.v6.1' into linux-next

* stable/pvh.v6.1:
  x86/xen: Use __pa_symbol instead of __pa on C visible symbols
  xen/privcmd: fix condition in privcmd_close()
  xen/x86: remove duplicated include from enlighten.c
  xen: include correct header for xen_pfn_t definition.
  xen: x86 pvh: use XENMEM_add_to_physmap_range for foreign gmfn mappings
  xen: arm: implement remap interfaces needed for privcmd mappings.
  xen: correctly use xen_pfn_t in remap_domain_mfn_range.
  xen: arm: enable balloon driver
  xen: balloon: allow PVMMU interfaces to be compiled out
  xen/pvh: /dev/xen/privcmd changes.
  xen/pvh: balloon and grant changes.

Conflicts:
	arch/arm/xen/enlighten.c
	arch/x86/xen/mmu.c
	drivers/xen/Makefile
	drivers/xen/privcmd.c
---

ca63454c05deabcfcd44b5dde7b9344b811061a8
diff --cc arch/arm/xen/enlighten.c
index 7ef3fa918a74,f28fc1ac8760..d4b23f4cda98
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@@ -247,15 -247,3 +247,14 @@@ static int __init xen_init_events(void
  	return 0;
  }
  postcore_initcall(xen_init_events);
 +
- 
 +/* In the hypervisor.S file. */
 +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_xen_version);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_console_io);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_sched_op);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_hvm_op);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_memory_op);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op);
- EXPORT_SYMBOL_GPL(privcmd_call);
++EXPORT_SYMBOL_GPL(privcmd_call);