Linus Torvalds 520045db94 Merge branches 'upstream/xenfs' and 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'upstream/xenfs' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen/privcmd: make privcmd visible in domU
  xen/privcmd: move remap_domain_mfn_range() to core xen code and export.
  privcmd: MMAPBATCH: Fix error handling/reporting
  xenbus: export xen_store_interface for xenfs
  xen/privcmd: make sure vma is ours before doing anything to it
  xen/privcmd: print SIGBUS faults
  xen/xenfs: set_page_dirty is supposed to return true if it dirties
  xen/privcmd: create address space to allow writable mmaps
  xen: add privcmd driver
  xen: add variable hypercall caller
  xen: add xen_set_domain_pte()
  xen: add /proc/xen/xsd_{kva,port} to xenfs

* 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: (29 commits)
  xen: include xen/xen.h for definition of xen_initial_domain()
  xen: use host E820 map for dom0
  xen: correctly rebuild mfn list list after migration.
  xen: improvements to VIRQ_DEBUG output
  xen: set up IRQ before binding virq to evtchn
  xen: ensure that all event channels start off bound to VCPU 0
  xen/hvc: only notify if we actually sent something
  xen: don't add extra_pages for RAM after mem_end
  xen: add support for PAT
  xen: make sure xen_max_p2m_pfn is up to date
  xen: limit extra memory to a certain ratio of base
  xen: add extra pages for E820 RAM regions, even if beyond mem_end
  xen: make sure xen_extra_mem_start is beyond all non-RAM e820
  xen: implement "extra" memory to reserve space for pages not present at boot
  xen: Use host-provided E820 map
  xen: don't map missing memory
  xen: defer building p2m mfn structures until kernel is mapped
  xen: add return value to set_phys_to_machine()
  xen: convert p2m to a 3 level tree
  xen: make install_p2mtop_page() static
  ...

Fix up trivial conflict in arch/x86/xen/mmu.c, and fix the use of
'reserve_early()' - in the new memblock world order it is now
'memblock_x86_reserve_range()' instead. Pointed out by Jeremy.
2010-10-26 18:20:19 -07:00
..
2010-06-08 21:13:48 +02:00
2010-08-02 08:45:56 -07:00
2009-01-29 14:16:51 +01:00
2010-04-28 17:25:53 -07:00
2009-12-05 09:10:12 -08:00
2010-02-16 21:22:26 -08:00
2010-10-26 16:52:08 -07:00
2010-05-07 17:13:04 -07:00
2009-03-27 14:43:57 -04:00
2009-08-27 00:35:56 +02:00
2010-03-10 13:23:34 +01:00
2010-10-26 16:52:08 -07:00
2009-01-21 17:26:06 +09:00
2010-06-29 12:12:59 +02:00
2010-10-07 14:08:55 +01:00
2010-08-14 22:26:51 +02:00
2009-06-13 15:37:30 +02:00
2010-10-24 10:53:05 +02:00
2010-06-09 11:12:36 +02:00
2010-01-05 15:34:49 +09:00
2010-06-29 12:12:59 +02:00
2010-05-07 17:13:04 -07:00
2010-10-24 10:52:26 +02:00
2010-10-21 10:10:44 -04:00
2010-06-29 12:12:59 +02:00
2010-09-10 10:56:47 +02:00
2010-10-26 16:52:08 -07:00
2010-10-26 16:52:08 -07:00
2009-02-02 23:27:09 +05:30
2010-02-12 09:42:39 -08:00
2010-07-20 17:41:14 -07:00
2010-10-22 12:57:17 -07:00
2010-01-22 16:05:42 -08:00
2009-06-15 12:40:02 +02:00
2009-01-31 00:19:32 +05:30
2009-08-21 21:43:46 +02:00
2010-08-01 10:46:31 +03:00
2009-06-15 12:40:02 +02:00