• Linus Torvalds's avatar
    Merge tag 'stable/for-linus-3.8-rc0-tag' of... · 896ea17d
    Linus Torvalds authored
    Merge tag 'stable/for-linus-3.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
    
    Pull Xen updates from Konrad Rzeszutek Wilk:
     - Add necessary infrastructure to make balloon driver work under ARM.
     - Add /dev/xen/privcmd interfaces to work with ARM and PVH.
     - Improve Xen PCIBack wild-card parsing.
     - Add Xen ACPI PAD (Processor Aggregator) support - so can offline/
       online sockets depending on the power consumption.
     - PVHVM + kexec = use an E820_RESV region for the shared region so we
       don't overwrite said region during kexec reboot.
     - Cleanups, compile fixes.
    
    Fix up some trivial conflicts due to the balloon driver now working on
    ARM, and there were changes next to the previous work-arounds that are
    now gone.
    
    * tag 'stable/for-linus-3.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen/PVonHVM: fix compile warning in init_hvm_pv_info
      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: privcmd: support autotranslated physmap guests.
      xen: add pages parameter to xen_remap_domain_mfn_range
      xen/acpi: Move the xen_running_on_version_or_later function.
      xen/xenbus: Remove duplicate inclusion of asm/xen/hypervisor.h
      xen/acpi: Fix compile error by missing decleration for xen_domain.
      xen/acpi: revert pad config check in xen_check_mwait
      xen/acpi: ACPI PAD driver
      xen-pciback: reject out of range inputs
      xen-pciback: simplify and tighten parsing of device IDs
      xen PVonHVM: use E820_Reserved area for shared_info
    896ea17d
enlighten.c 6.8 KB