linux/arch
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
..
alpha alpha: use single HAE window on T2 core logic (gamma, sable) 2010-10-26 16:52:12 -07:00
arm replace nested max/min macros with {max,min}3 macro 2010-10-26 16:52:12 -07:00
avr32 mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
blackfin m68k{nommu}/blackfin : remove old assembler-only flags bit definitions 2010-10-26 16:52:12 -07:00
cris mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
frv mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
h8300 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
ia64 mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
m32r mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
m68k m68k{nommu}/blackfin : remove old assembler-only flags bit definitions 2010-10-26 16:52:12 -07:00
m68knommu Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2010-10-25 07:44:27 -07:00
microblaze mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
mips mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
mn10300 mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
parisc mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
powerpc replace nested max/min macros with {max,min}3 macro 2010-10-26 16:52:12 -07:00
s390 mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
score mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
sh mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
sparc mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
tile Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 2010-10-26 17:25:38 -07:00
um um: migrate from __do_IRQ() to generic_handle_irq() 2010-10-26 16:52:12 -07:00
x86 Merge branches 'upstream/xenfs' and 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen 2010-10-26 18:20:19 -07:00
xtensa mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
.gitignore
Kconfig