Hi Mark and Alex,
Please pull the KVM support to LSK based on v3.10.
For these patches to work, please pull the GICv3 patches and ARM THP patches first, as sent previously.
Note that the diffstat looks weird but the shortlog looks just fine. Not completely sure what the reson behind the weird diffstat is, probably the amount of merges in either branch. Let me know if I need to rebase the topic branch or something else.
For the resolution of any conflicts, see my example merge of these branches here: http://git.linaro.org/git-ro/people/christoffer.dall/linux-kvm-arm.git lsk/lsk-with-kvm-v3.10
The following changes since commit 91e8ffa66ead9f85ff86bdcb03042ada441acf78:
arm64: add support for reserved memory defined by device tree (2014-09-13 10:23:13 -0700)
are available in the git repository at:
http://git.linaro.org/git-ro/people/christoffer.dall/linux-kvm-arm.git kvm-for-lsk-v3.10-v1
for you to fetch changes up to b8a669d29702a8fb529f4fae450a86b8676b0e42:
KVM: correct null pid check in kvm_vcpu_yield_to() (2014-10-08 11:11:28 +0200)
---------------------------------------------------------------- KVM/ARM/arm64 Support for LSK v3.10
---------------------------------------------------------------- Alex Bennée (2): arm64: KVM: export demux regids as KVM_REG_ARM64 arm64: KVM: allow export and import of generic timer regs
Alex Williamson (1): kvm: Add VFIO device
Alexander Graf (2): KVM: Rename and add argument to check_extension KVM: Allow KVM_CHECK_EXTENSION on the vm fd
Andi Kleen (1): asmlinkage, kvm: Make kvm_rebooting visible
Andre Przywara (2): ARM/KVM: save and restore generic timer registers KVM: arm/arm64: vgic: fix GICD_ICFGR register accesses
Andre Richter (1): virt/kvm/iommu.c: Add leading zeros to device's BDF notation in debug messages
Andrea Arcangeli (1): kvm: optimize away THP checks in kvm_is_mmio_pfn()
Andrew Morton (1): include/linux/mm.h: add PAGE_ALIGNED() helper
Andy Honig (1): KVM: Improve create VCPU parameter (CVE-2013-4587)
Aneesh Kumar K.V (1): kvm: Add struct kvm arg to memslot APIs
Anup Patel (19): ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq KVM: ARM: Fix typo in comments of inject_abt() ARM: KVM: Implement kvm_vcpu_preferred_target() function ARM64: KVM: Implement kvm_vcpu_preferred_target() function ARM/ARM64: KVM: Implement KVM_ARM_PREFERRED_TARGET ioctl arm64: KVM: Add Kconfig option for max VCPUs per-Guest arm64: KVM: Support X-Gene guest VCPU on APM X-Gene host arm64: KVM: Force undefined exception for Guest SMC intructions KVM: Add capability to advertise PSCI v0.2 support ARM/ARM64: KVM: Add common header for PSCI related defines ARM/ARM64: KVM: Add base for PSCI v0.2 emulation ARM/ARM64: KVM: Make kvm_psci_call() return convention more flexible KVM: Add KVM_EXIT_SYSTEM_EVENT to user space API header ARM/ARM64: KVM: Emulate PSCI v0.2 SYSTEM_OFF and SYSTEM_RESET ARM/ARM64: KVM: Emulate PSCI v0.2 AFFINITY_INFO ARM/ARM64: KVM: Emulate PSCI v0.2 MIGRATE_INFO_TYPE and related functions ARM/ARM64: KVM: Fix CPU_ON emulation for PSCI v0.2 ARM/ARM64: KVM: Emulate PSCI v0.2 CPU_SUSPEND ARM/ARM64: KVM: Advertise KVM_CAP_ARM_PSCI_0_2 to user space
Ard Biesheuvel (3): ARM/arm64: KVM: fix use of WnR bit in kvm_is_write_fault() mm: export symbol dependencies of is_zero_pfn() KVM: check for !is_zero_pfn() in kvm_is_mmio_pfn()
Arnd Bergmann (1): ARM: kvm: don't include drivers/virtio/Kconfig
Borislav Petkov (1): kvm: Add KVM_GET_EMULATED_CPUID
Chen Gang (1): arm64: KVM: use 'int' instead of 'u32' for variable 'target' in kvm_host.h.
Christian Borntraeger (5): kvm/irqchip: Speed up KVM_SET_GSI_ROUTING KVM: avoid unnecessary synchronize_rcu KVM: remove redundant check of in_spin_loop KVM: remove redundant assigment of return value in kvm_dev_ioctl KVM: remove redundant assignments in __kvm_set_memory_region
Christoffer Dall (44): Merge tag 'v3.10.13' into lsk/v3.10/topic/kvm ARM: KVM: Fix unaligned unmap_range leak KVM: ARM: Squash len warning ARM: 7808/1: KVM: mm: Get rid of L_PTE_USER ref from PAGE_S2_DEVICE ARM: KVM: Bugfix: vgic_bytemap_get_reg per cpu regs ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256 ARM: KVM: Fix kvm_set_pte assignment ARM: KVM: Simplify tracepoint text ARM: KVM: Work around older compiler bug ARM: KVM: Add newlines to panic strings KVM: Move gfn_to_index to x86 specific code KVM: ARM: Get rid of KVM_HPAGE defines KVM: arm64: Get rid of KVM_HPAGE defines KVM: ARM: Update comments for kvm_handle_wfi KVM: ARM: Support hugetlbfs backed huge pages KVM: ARM: Transparent huge page (THP) support arm/arm64: KVM: Fix hyp mappings of vmalloc regions arm: KVM: Don't return PSCI_INVAL if waitqueue is inactive arm/arm64: KVM: arch_timer: Initialize cntvoff at kvm_init ARM: KVM: Allow creating the VGIC after VCPUs KVM: arm-vgic: Support KVM_CREATE_DEVICE for VGIC KVM: arm-vgic: Set base addr through device API irqchip: arm-gic: Define additional MMIO offsets and masks KVM: arm-vgic: Make vgic mmio functions more generic arm/arm64: kvm: Set vcpu->cpu to -1 on vcpu_put KVM: arm-vgic: Add vgic reg access from dev attr KVM: arm-vgic: Support unqueueing of LRs to the dist KVM: arm-vgic: Add GICD_SPENDSGIR and GICD_CPENDSGIR handlers KVM: arm-vgic: Support CPU interface reg access arm64: KVM: Add VGIC device control for arm64 arm/arm64: KVM: Fix and refactor unmap_range KVM: Introduce gfn_to_hva_memslot_prot arm/arm64: KVM: Support KVM_CAP_READONLY_MEM KVM: Unconditionally export KVM_CAP_READONLY_MEM KVM: Unconditionally export KVM_CAP_USER_NMI arm/arm64: KVM: Rename irq_state to irq_pending arm/arm64: KVM: Rename irq_active to irq_queued arm/arm64: KVM: vgic: Clear queued flags on unqueue arm/arm64: KVM: vgic: Improve handling of GICD_I{CS}PENDRn arm/arm64: KVM: vgic: Fix SGI writes to GICD_I{CS}PENDR0 arm/arm64: KVM: vgic: Clarify and correct vgic documentation arm/arm64: KVM: Fix set_clear_sgi_pend_reg offset arm/arm64: KVM: Report correct FSC for unsupported fault types Revert "arm, kvm: fix double lock on cpu_add_remove_lock"
Dan Carpenter (1): KVM: return an error code in kvm_vm_ioctl_register_coalesced_mmio()
Dave P Martin (1): ARM: KVM: Don't handle PSCI calls via SMC
David Hildenbrand (1): KVM: prepare for KVM_(S|G)ET_MP_STATE on other architectures
Dominik Dingel (3): KVM: async_pf: Provide additional direct page notification KVM: async_pf: Allow to wait for outstanding work KVM: async_pf: Add missing call for async page present
Eric Auger (2): ARM: KVM: Unmap IPA on memslot delete/move KVM: EVENTFD: remove inclusion of irq.h
Geoff Levand (1): arm/kvm: Cleanup KVM_ARM_MAX_VCPUS logic
Gleb Natapov (2): Fix NULL dereference in gfn_to_hva_prot() KVM: remove vm mmap method
Haibin Wang (2): KVM: ARM: vgic: Fix sgi dispatch problem KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address.
Heiko Carstens (2): KVM: kvm_clear_guest_page(): fix empty_zero_page usage KVM: add kvm_is_error_gpa() helper
Joel Schopp (1): arm/arm64: KVM: Fix VTTBR_BADDR_MASK and pgd alloc
Jonathan Austin (3): KVM: ARM: Fix calculation of virtual CPU ID KVM: ARM: fix the size of TTBCR_{T0SZ,T1SZ} masks KVM: ARM: Add support for Cortex-A7
Kim Phillips (1): ARM: KVM: user_mem_abort: support stage 2 MMIO page mapping
Lorenzo Pieralisi (1): arm: kvm: implement CPU PM notifier
Marc Zyngier (107): ARM: KVM: move GIC/timer code to a common location KVM: get rid of $(addprefix ../../../virt/kvm/, ...) in Makefiles arm64: KVM: HYP mode idmap support arm64: KVM: EL2 register definitions arm64: KVM: system register definitions for 64bit guests arm64: KVM: Basic ESR_EL2 helpers and vcpu register access arm64: KVM: fault injection into a guest arm64: KVM: architecture specific MMU backend arm64: KVM: user space interface arm64: KVM: system register handling arm64: KVM: CPU specific system registers handling arm64: KVM: virtual CPU reset arm64: KVM: kvm_arch and kvm_vcpu_arch definitions arm64: KVM: MMIO access backend arm64: KVM: guest one-reg interface arm64: KVM: hypervisor initialization code arm64: KVM: HYP mode world switch implementation arm64: KVM: Exit handling arm64: KVM: Plug the VGIC ARM: KVM: timer: allow DT matching for ARMv8 cores arm64: KVM: Plug the arch timer arm64: KVM: PSCI implementation arm64: KVM: Build system integration arm64: KVM: define 32bit specific registers arm64: KVM: 32bit GP register access arm64: KVM: 32bit conditional execution emulation arm64: KVM: 32bit handling of coprocessor traps arm64: KVM: CPU specific 32bit coprocessor access arm64: KVM: 32bit specific register world switch arm64: KVM: 32bit guest fault injection arm64: KVM: enable initialization of a 32bit vcpu arm64: KVM: userspace API documentation arm64: KVM: MAINTAINERS update arm64: KVM: document kernel object mappings in HYP ARM: KVM: remove dead prototype for __kvm_tlb_flush_vmid ARM: KVM: use phys_addr_t instead of unsigned long long for HYP PGDs ARM: KVM: don't special case PC when doing an MMIO ARM: KVM: get rid of S2_PGD_SIZE arm64: KVM: Kconfig integration arm64: KVM: fix 2-level page tables unmapping arm64: KVM: perform save/restore of PAR_EL1 arm64: KVM: add missing dsb before invalidating Stage-2 TLBs ARM: KVM: vgic: simplify vgic_get_target_reg ARM: KVM: vgic: fix GICD_ICFGRn access ARM: KVM: Yield CPU when vcpu executes a WFE ARM: KVM: Fix MPIDR computing to support virtual clusters ARM: KVM: fix L2CTLR to be per-cluster ARM: KVM: drop limitation to 4 CPU VMs arm/arm64: KVM: PSCI: use MPIDR to identify a target CPU arm64: KVM: Yield CPU when vcpu executes a WFE arm64: KVM: initialize HYP mode following the kernel endianness arm64: KVM: vgic: byteswap GICv2 access on world switch if BE arm/arm64: KVM: MMIO support for BE guest arm/arm64: KVM: PSCI: propagate caller endianness to the incoming vcpu arm/arm64: KVM: relax the requirements of VMA alignment for THP arm/arm64: KVM: detect CPU reset on CPU_PM_EXIT arm64: KVM: force cache clean on page fault when caches are off arm64: KVM: allows discrimination of AArch32 sysreg access arm64: KVM: trap VM system registers until MMU and caches are ON ARM: KVM: introduce kvm_p*d_addr_end arm64: KVM: flush VM pages before letting the guest enable caches ARM: KVM: force cache clean on page fault when caches are off ARM: KVM: fix handling of trapped 64bit coprocessor accesses ARM: KVM: fix ordering of 64bit coprocessor accesses ARM: KVM: introduce per-vcpu HYP Configuration Register ARM: KVM: add world-switch for AMAIR{0,1} ARM: KVM: trap VM system registers until MMU and caches are ON ARM: KVM: fix warning in mmu.c ARM: KVM: fix non-VGIC compilation arm64: KVM: Enable minimalistic support for Cortex-A53 KVM: arm/arm64: vgic: move GICv2 registers to their own structure KVM: ARM: vgic: introduce vgic_ops and LR manipulation primitives KVM: ARM: vgic: abstract access to the ELRSR bitmap KVM: ARM: vgic: abstract EISR bitmap access KVM: ARM: vgic: abstract MISR decoding KVM: ARM: vgic: move underflow handling to vgic_ops KVM: ARM: vgic: abstract VMCR access KVM: ARM: vgic: introduce vgic_enable KVM: ARM: introduce vgic_params structure KVM: ARM: vgic: split GICv2 backend from the main vgic code KVM: ARM: vgic: revisit implementation of irqchip_in_kernel arm64: KVM: remove __kvm_hyp_code_{start,end} from hyp.S arm64: KVM: split GICv2 world switch from hyp code arm64: KVM: move HCR_EL2.{IMO,FMO} manipulation into the vgic switch code KVM: ARM: vgic: add the GICv3 backend arm64: KVM: vgic: add GICv3 world switch arm64: KVM: vgic: enable GICv2 emulation on top on GICv3 hardware arm64: KVM: rename pm_fake handler to trap_raz_wi arm64: move DBG_MDSCR_* to asm/debug-monitors.h arm64: KVM: add trap handlers for AArch64 debug registers arm64: KVM: common infrastructure for handling AArch32 CP14/CP15 arm64: KVM: use separate tables for AArch32 32 and 64bit traps arm64: KVM: check ordering of all system register tables arm64: KVM: add trap handlers for AArch32 debug registers arm64: KVM: implement lazy world switch for debug registers arm64: KVM: enable trapping of all debug registers arm64: KVM: GICv3: move system register access to msr_s/mrs_s KVM: arm64: GICv3: mandate page-aligned GICV region arm64: KVM: fix 64bit CP15 VM access for 32bit guests KVM: ARM: vgic: plug irq injection race arm/arm64: KVM: vgic: switch to dynamic allocation arm/arm64: KVM: vgic: Parametrize VGIC_NR_SHARED_IRQS arm/arm64: KVM: vgic: kill VGIC_MAX_CPUS arm/arm64: KVM: vgic: handle out-of-range MMIO accesses arm/arm64: KVM: vgic: kill VGIC_NR_IRQS arm/arm64: KVM: vgic: delay vgic allocation until init time arm/arm64: KVM: vgic: make number of irqs a configurable attribute
Mark Rustad (1): kvm: Resolve missing-field-initializers warnings
Mark Rutland (2): ARM: KVM: arch_timers: zero CNTVOFF upon return to host arm64: fix typo: s/SERRROR/SERROR/
Mark Salter (1): arm: KVM: fix possible misalignment of PGDs and bounce page
Masanari Iida (1): treewide: Fix typos in printk
Michael Mueller (1): KVM: add kvm_arch_vcpu_runnable() test to kvm_vcpu_on_spin() loop
Michael S. Tsirkin (1): kvm_host: typo fix
Ming Lei (1): arm, kvm: fix double lock on cpu_add_remove_lock
Oleg Nesterov (3): KVM: async_pf: mm->mm_users can not pin apf->mm KVM: async_pf: kill the unnecessary use_mm/unuse_mm async_pf_execute() KVM: async_pf: change async_pf_execute() to use get_user_pages(tsk => NULL)
Olof Johansson (1): ARM: kvm: rename cpu_reset to avoid name clash
Paolo Bonzini (8): KVM: mmu: allow page tables to be in read-only slots KVM: cleanup (physical) CPU hotplug KVM: protect kvm_usage_count with its own spinlock KVM: Convert kvm_lock back to non-raw spinlock KVM: use a more sensible error number when debugfs directory creation fails KVM: add missing cleanup_srcu_struct KVM: Move more code under CONFIG_HAVE_KVM_IRQFD KVM: forward declare structs in kvm_types.h
Paul Mackerras (5): KVM: Don't keep reference to irq routing table in irqfd struct KVM: irqchip: Provide and use accessors for irq routing table KVM: Move all accesses to kvm::irq_routing into irqchip.c KVM: Move irq notifier implementation into eventfd.c KVM: Give IRQFD its own separate enabling Kconfig option
Radha Mohan Chintakuntla (1): arm64: Add boot time configuration of Intermediate Physical Address size
Radim Krčmář (5): kvm: free resources after canceling async_pf kvm: remove .done from struct kvm_async_pf KVM: add kvm_arch_sched_in KVM: static inline empty kvm_arch functions KVM: remove garbage arg to *hardware_{en,dis}able
Russell King (1): ARM: make it easier to check the CPU part number correctly
Sachin Kamat (1): KVM: ARM: Remove duplicate include
Sam Bobroff (1): KVM: correct null pid check in kvm_vcpu_yield_to()
Santosh Shilimkar (2): arm/arm64: kvm: Use virt_to_idmap instead of virt_to_phys for idmap mappings ARM: mm: Introduce virt_to_idmap() with an arch hook
Scott Wood (1): kvm: Provide kvm_vcpu_eligible_for_directed_yield() stub
Stephen Hemminger (1): kvm: make local functions static
Takuya Yoshikawa (2): KVM: Introduce kvm_arch_memslots_updated() KVM: Use cond_resched() directly and remove useless kvm_resched()
Victor Kamensky (13): ARM: KVM: fix vgic V7 assembler code to work in BE image ARM: KVM: handle 64bit values passed to mrcc or from mcrr instructions in BE case ARM: KVM: __kvm_vcpu_run function return result fix in BE case ARM: KVM: vgic mmio should hold data as LE bytes array in BE case ARM: KVM: MMIO support BE host running LE code ARM: KVM: one_reg coproc set and get BE fixes ARM: KVM: enable KVM in Kconfig on big-endian systems ARM64: KVM: MMIO support BE host running LE code ARM64: KVM: store kvm_vcpu_fault_info est_el2 as word ARM64: KVM: fix vgic_bitmap_get_reg function for BE 64bit case ARM64: KVM: set and get of sys registers in BE case ARM64: KVM: fix big endian issue in access_vm_reg for 32bit guest ARM: 7990/1: asm: rename logical shift macros push pull into lspush lspull
Vladimir Murzin (1): arm: kvm: fix CPU hotplug
Wei Yongjun (1): KVM: add missing misc_deregister() on error in kvm_init()
Will Deacon (15): ARM: kvm: use inner-shareable barriers after TLB flushing ARM: KVM: disable KVM in Kconfig on big-endian systems arm64: barriers: make use of barrier options with explicit barriers arm64: kvm: use inner-shareable barriers for inner-shareable maintenance kvm: arm64: vgic: fix hyp panic with 64k pages on juno platform KVM: ARM/arm64: fix non-const declaration of function returning const KVM: ARM/arm64: fix broken __percpu annotation KVM: ARM/arm64: avoid returning negative error code as bool KVM: ARM/arm64: return -EFAULT if copy_from_user fails in set_timer_reg KVM: vgic: return int instead of bool when checking I/O ranges KVM: vgic: declare probe function pointer as const KVM: device: add simple registration mechanism for kvm_device_ops KVM: ARM: vgic: register kvm_device_ops dynamically KVM: VFIO: register kvm_device_ops dynamically ARM: barrier: allow options to be passed to memory barrier instructions
Yang Zhang (1): KVM: Mapping IOMMU pages after updating memslot
Yann Droneaud (1): kvm: use anon_inode_getfd() with O_CLOEXEC flag
chai wen (1): KVM: Drop FOLL_GET in GUP when doing async page fault
Documentation/DocBook/media_api.tmpl | 4 +- Documentation/arm64/memory.txt | 7 + Documentation/hwmon/k10temp | 1 + Documentation/i2c/busses/i2c-piix4 | 2 +- Documentation/parisc/registers | 8 + Documentation/virtual/kvm/api.txt | 186 +- Documentation/virtual/kvm/devices/arm-vgic.txt | 83 + Documentation/virtual/kvm/devices/vfio.txt | 22 + Documentation/virtual/kvm/locking.txt | 8 +- MAINTAINERS | 10 + Makefile | 4 +- arch/Kconfig | 6 + arch/arc/include/asm/ptrace.h | 2 + arch/arc/include/asm/syscall.h | 5 +- arch/arc/kernel/entry.S | 4 +- arch/arc/lib/strchr-700.S | 10 + arch/arm/Kconfig | 4 +- arch/arm/boot/compressed/atags_to_fdt.c | 44 +- arch/arm/boot/dts/at91rm9200.dtsi | 6 +- arch/arm/boot/dts/at91sam9260.dtsi | 18 +- arch/arm/boot/dts/at91sam9263.dtsi | 8 +- arch/arm/boot/dts/at91sam9g45.dtsi | 8 +- arch/arm/boot/dts/at91sam9n12.dtsi | 8 +- arch/arm/boot/dts/at91sam9n12ek.dts | 4 +- arch/arm/boot/dts/at91sam9x5.dtsi | 10 +- arch/arm/boot/dts/imx23.dtsi | 8 +- arch/arm/boot/dts/imx28.dtsi | 8 +- arch/arm/boot/dts/imx6dl.dtsi | 2 + arch/arm/boot/dts/imx6q.dtsi | 4 + arch/arm/boot/dts/sama5d3.dtsi | 4 + arch/arm/boot/dts/sun4i-a10.dtsi | 4 + arch/arm/boot/dts/sun5i-a13.dtsi | 4 + arch/arm/include/asm/a.out-core.h | 45 - arch/arm/include/asm/assembler.h | 12 +- arch/arm/include/asm/barrier.h | 32 +- arch/arm/include/asm/cputype.h | 35 +- arch/arm/include/asm/elf.h | 6 + arch/arm/include/asm/kvm_arm.h | 12 +- arch/arm/include/asm/kvm_asm.h | 44 +- arch/arm/include/asm/kvm_emulate.h | 75 +- arch/arm/include/asm/kvm_host.h | 50 +- arch/arm/include/asm/kvm_mmu.h | 69 +- arch/arm/include/asm/kvm_psci.h | 6 +- arch/arm/include/asm/kvm_vgic.h | 220 -- arch/arm/include/asm/memory.h | 16 + arch/arm/include/asm/mmu.h | 3 + arch/arm/include/asm/mmu_context.h | 30 +- arch/arm/include/asm/page.h | 2 + arch/arm/include/asm/pgtable-3level.h | 2 + arch/arm/include/asm/pgtable.h | 2 +- arch/arm/include/asm/processor.h | 4 - arch/arm/include/asm/smp_scu.h | 2 +- arch/arm/include/asm/thread_info.h | 1 - arch/arm/include/asm/tlb.h | 7 +- arch/arm/include/uapi/asm/Kbuild | 1 - arch/arm/include/uapi/asm/a.out.h | 34 - arch/arm/include/uapi/asm/kvm.h | 43 +- arch/arm/kernel/asm-offsets.c | 15 +- arch/arm/kernel/entry-armv.S | 103 +- arch/arm/kernel/fiq.c | 19 +- arch/arm/kernel/perf_event.c | 11 +- arch/arm/kernel/perf_event_cpu.c | 64 +- arch/arm/kernel/process.c | 46 +- arch/arm/kernel/signal.c | 52 +- arch/arm/kernel/signal.h | 12 - arch/arm/kernel/smp.c | 4 +- arch/arm/kernel/smp_tlb.c | 18 +- arch/arm/kernel/smp_twd.c | 2 +- arch/arm/kernel/traps.c | 46 +- arch/arm/kernel/vmlinux.lds.S | 17 + arch/arm/kvm/Kconfig | 9 +- arch/arm/kvm/Makefile | 10 +- arch/arm/kvm/arm.c | 173 +- arch/arm/kvm/coproc.c | 316 ++- arch/arm/kvm/coproc.h | 13 +- arch/arm/kvm/coproc_a15.c | 125 +- arch/arm/kvm/coproc_a7.c | 54 + arch/arm/kvm/emulate.c | 2 +- arch/arm/kvm/guest.c | 115 +- arch/arm/kvm/handle_exit.c | 35 +- arch/arm/kvm/init.S | 6 +- arch/arm/kvm/interrupts.S | 48 +- arch/arm/kvm/interrupts_head.S | 79 +- arch/arm/kvm/mmio.c | 95 +- arch/arm/kvm/mmu.c | 522 ++++- arch/arm/kvm/psci.c | 263 ++- arch/arm/kvm/reset.c | 27 +- arch/arm/kvm/trace.h | 7 +- arch/arm/kvm/vgic.c | 1499 ------------ arch/arm/lib/copy_template.S | 36 +- arch/arm/lib/csumpartialcopygeneric.S | 96 +- arch/arm/lib/io-readsl.S | 12 +- arch/arm/lib/io-writesl.S | 12 +- arch/arm/lib/memmove.S | 36 +- arch/arm/lib/uaccess.S | 192 +- arch/arm/mach-davinci/board-dm355-leopard.c | 1 + arch/arm/mach-davinci/board-dm644x-evm.c | 1 + arch/arm/mach-davinci/board-dm646x-evm.c | 1 + arch/arm/mach-davinci/board-neuros-osd2.c | 1 + arch/arm/mach-footbridge/dc21285.c | 2 - arch/arm/mach-s3c24xx/clock-s3c2410.c | 161 +- arch/arm/mach-s3c24xx/clock-s3c2440.c | 3 + arch/arm/mach-shmobile/setup-emev2.c | 8 +- arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +- arch/arm/mach-versatile/include/mach/platform.h | 2 + arch/arm/mach-versatile/pci.c | 47 +- arch/arm/mm/Kconfig | 37 + arch/arm/mm/context.c | 55 +- arch/arm/mm/idmap.c | 5 +- arch/arm/mm/init.c | 2 +- arch/arm/mm/mmu.c | 14 +- arch/arm/mm/proc-v7-2level.S | 2 +- arch/arm/mm/proc-v7-3level.S | 2 +- arch/arm/mm/proc-v7.S | 11 +- arch/arm/plat-samsung/include/plat/clock.h | 5 + arch/arm/xen/enlighten.c | 6 +- arch/arm64/Kconfig | 2 + arch/arm64/Makefile | 1 + arch/arm64/include/asm/cputype.h | 1 + arch/arm64/include/asm/debug-monitors.h | 19 +- arch/arm64/include/asm/kvm_arm.h | 259 ++ arch/arm64/include/asm/kvm_asm.h | 141 ++ arch/arm64/include/asm/kvm_coproc.h | 57 + arch/arm64/include/asm/kvm_emulate.h | 268 +++ arch/arm64/include/asm/kvm_host.h | 251 ++ arch/arm64/include/asm/kvm_mmio.h | 59 + arch/arm64/include/asm/kvm_mmu.h | 157 ++ arch/arm64/include/asm/kvm_psci.h | 27 + arch/arm64/include/asm/pgtable-hwdef.h | 7 +- arch/arm64/include/asm/tlb.h | 7 +- arch/arm64/include/asm/virt.h | 4 + arch/arm64/include/uapi/asm/kvm.h | 201 ++ arch/arm64/kernel/asm-offsets.c | 46 + arch/arm64/kernel/debug-monitors.c | 9 - arch/arm64/kernel/vmlinux.lds.S | 20 + arch/arm64/kvm/Kconfig | 63 + arch/arm64/kvm/Makefile | 27 + arch/arm64/kvm/emulate.c | 158 ++ arch/arm64/kvm/guest.c | 359 +++ arch/arm64/kvm/handle_exit.c | 133 ++ arch/arm64/kvm/hyp-init.S | 116 + arch/arm64/kvm/hyp.S | 1274 ++++++++++ arch/arm64/kvm/inject_fault.c | 203 ++ arch/arm64/kvm/regmap.c | 168 ++ arch/arm64/kvm/reset.c | 112 + arch/arm64/kvm/sys_regs.c | 1528 ++++++++++++ arch/arm64/kvm/sys_regs.h | 140 ++ arch/arm64/kvm/sys_regs_generic_v8.c | 100 + arch/arm64/kvm/vgic-v2-switch.S | 133 ++ arch/arm64/kvm/vgic-v3-switch.S | 267 +++ arch/arm64/mm/proc.S | 8 +- arch/c6x/mm/init.c | 1 + arch/ia64/include/asm/kvm_host.h | 15 +- arch/ia64/include/asm/tlb.h | 9 +- arch/ia64/kvm/Kconfig | 1 + arch/ia64/kvm/Makefile | 7 +- arch/ia64/kvm/kvm-ia64.c | 37 +- arch/m68k/emu/natfeat.c | 23 +- arch/m68k/include/asm/div64.h | 9 +- arch/microblaze/Kconfig | 2 +- arch/mips/Kconfig | 2 +- arch/mips/ath79/clock.c | 2 +- arch/mips/cavium-octeon/setup.c | 5 +- arch/mips/include/asm/io.h | 5 + arch/mips/include/asm/kvm_host.h | 16 +- arch/mips/kvm/kvm_mips.c | 9 +- arch/mips/mm/init.c | 1 + arch/parisc/include/asm/parisc-device.h | 3 + arch/parisc/include/asm/special_insns.h | 9 +- arch/parisc/include/asm/tlbflush.h | 5 +- arch/parisc/kernel/cache.c | 137 +- arch/parisc/kernel/inventory.c | 1 + arch/parisc/lib/memcpy.c | 79 +- arch/powerpc/Kconfig | 3 +- arch/powerpc/include/asm/exception-64s.h | 8 +- arch/powerpc/include/asm/kvm_host.h | 13 +- arch/powerpc/include/asm/kvm_ppc.h | 6 +- arch/powerpc/include/asm/module.h | 5 +- arch/powerpc/include/asm/page.h | 10 + arch/powerpc/include/asm/processor.h | 4 + arch/powerpc/include/asm/reg.h | 32 +- arch/powerpc/include/asm/smp.h | 4 + arch/powerpc/include/asm/switch_to.h | 9 + arch/powerpc/kernel/align.c | 10 + arch/powerpc/kernel/asm-offsets.c | 3 + arch/powerpc/kernel/entry_64.S | 36 +- arch/powerpc/kernel/exceptions-64s.S | 57 +- arch/powerpc/kernel/hw_breakpoint.c | 3 +- arch/powerpc/kernel/lparcfg.c | 22 +- arch/powerpc/kernel/process.c | 10 + arch/powerpc/kernel/ptrace.c | 4 +- arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/kernel/signal_32.c | 70 +- arch/powerpc/kernel/signal_64.c | 8 +- arch/powerpc/kernel/tm.S | 20 + arch/powerpc/kernel/traps.c | 55 +- arch/powerpc/kernel/vmlinux.lds.S | 3 - arch/powerpc/kvm/Kconfig | 1 + arch/powerpc/kvm/Makefile | 13 +- arch/powerpc/kvm/book3s_hv.c | 2 +- arch/powerpc/kvm/book3s_xics.c | 1 + arch/powerpc/kvm/booke.c | 4 +- arch/powerpc/kvm/mpic.c | 4 +- arch/powerpc/kvm/powerpc.c | 33 +- arch/powerpc/mm/numa.c | 64 +- arch/powerpc/perf/core-book3s.c | 46 +- arch/powerpc/perf/power8-pmu.c | 17 + arch/powerpc/platforms/powernv/pci-ioda.c | 21 + arch/powerpc/platforms/pseries/setup.c | 31 +- arch/s390/Kconfig | 7 +- arch/s390/include/asm/bitops.h | 2 +- arch/s390/include/asm/kvm_host.h | 17 + arch/s390/include/asm/tlb.h | 8 +- arch/s390/kernel/setup.c | 1 + arch/s390/kvm/Makefile | 3 +- arch/s390/kvm/kvm-s390.c | 63 +- arch/s390/mm/init.c | 2 + arch/s390/oprofile/init.c | 2 +- arch/sh/include/asm/tlb.h | 6 +- arch/sparc/kernel/asm-offsets.c | 2 + arch/sparc/mm/hypersparc.S | 8 +- arch/sparc/mm/swift.S | 8 +- arch/sparc/mm/tsunami.S | 6 +- arch/sparc/mm/viking.S | 10 +- arch/um/include/asm/tlb.h | 6 +- arch/um/include/shared/os.h | 1 + arch/um/kernel/Makefile | 2 +- arch/um/kernel/maccess.c | 24 + arch/um/os-Linux/process.c | 52 + arch/x86/boot/compressed/eboot.c | 20 +- arch/x86/ia32/ia32_signal.c | 2 +- arch/x86/include/asm/bootparam_utils.h | 4 +- arch/x86/include/asm/checksum_32.h | 22 +- arch/x86/include/asm/kvm_host.h | 15 +- arch/x86/include/asm/mce.h | 13 +- arch/x86/include/asm/mmu_context.h | 20 +- arch/x86/include/asm/xor_avx.h | 4 +- arch/x86/include/uapi/asm/kvm.h | 6 +- arch/x86/kernel/acpi/sleep.c | 18 +- arch/x86/kernel/amd_nb.c | 13 +- arch/x86/kernel/cpu/mtrr/generic.c | 21 +- arch/x86/kernel/cpu/mtrr/main.c | 16 +- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 4 +- arch/x86/kernel/early-quirks.c | 14 +- arch/x86/kernel/head_64.S | 2 +- arch/x86/kernel/i387.c | 2 +- arch/x86/kernel/signal.c | 6 +- arch/x86/kernel/sys_x86_64.c | 2 +- arch/x86/kvm/Kconfig | 2 + arch/x86/kvm/Makefile | 13 +- arch/x86/kvm/cpuid.c | 57 +- arch/x86/kvm/cpuid.h | 5 +- arch/x86/kvm/mmu.c | 6 +- arch/x86/kvm/paging_tmpl.h | 20 +- arch/x86/kvm/svm.c | 4 +- arch/x86/kvm/vmx.c | 15 +- arch/x86/kvm/x86.c | 50 +- arch/x86/lib/csum-wrappers_64.c | 12 +- arch/x86/mm/init.c | 4 +- arch/x86/mm/mmap.c | 6 +- arch/x86/xen/setup.c | 22 + arch/x86/xen/smp.c | 11 +- arch/x86/xen/time.c | 17 +- arch/xtensa/kernel/head.S | 9 + arch/xtensa/kernel/setup.c | 6 +- block/cfq-iosched.c | 17 +- block/deadline-iosched.c | 16 +- block/elevator.c | 25 +- block/genhd.c | 2 +- block/noop-iosched.c | 17 +- crypto/algapi.c | 3 +- crypto/api.c | 7 +- drivers/acpi/Makefile | 1 + drivers/acpi/acpi_cmos_rtc.c | 92 + drivers/acpi/acpi_lpss.c | 3 +- drivers/acpi/acpi_memhotplug.c | 1 + drivers/acpi/acpica/hwxfsleep.c | 8 +- drivers/acpi/battery.c | 2 + drivers/acpi/device_pm.c | 23 +- drivers/acpi/ec.c | 8 + drivers/acpi/glue.c | 95 +- drivers/acpi/internal.h | 5 + drivers/acpi/proc.c | 8 + drivers/acpi/scan.c | 14 +- drivers/acpi/video.c | 8 + drivers/ata/Kconfig | 2 +- drivers/ata/ahci.c | 2 + drivers/ata/ata_piix.c | 4 +- drivers/ata/libahci.c | 3 +- drivers/ata/libata-pmp.c | 45 +- drivers/ata/libata-zpodd.c | 7 +- drivers/ata/sata_fsl.c | 5 +- drivers/ata/sata_highbank.c | 20 +- drivers/ata/sata_inic162x.c | 14 + drivers/base/memory.c | 2 + drivers/base/regmap/regcache-rbtree.c | 2 +- drivers/base/regmap/regcache.c | 3 +- drivers/base/regmap/regmap.c | 2 +- drivers/block/nbd.c | 10 +- drivers/block/rbd.c | 14 +- drivers/block/xen-blkback/blkback.c | 13 +- drivers/block/xen-blkfront.c | 36 +- drivers/bluetooth/ath3k.c | 46 +- drivers/bluetooth/btusb.c | 21 +- drivers/cdrom/cdrom.c | 2 +- drivers/char/agp/parisc-agp.c | 6 +- drivers/char/hw_random/bcm2835-rng.c | 2 +- drivers/char/virtio_console.c | 70 +- drivers/clk/clk-wm831x.c | 2 + drivers/clocksource/dw_apb_timer_of.c | 2 +- drivers/cpufreq/cpufreq.c | 23 +- drivers/cpufreq/cpufreq_conservative.c | 20 +- drivers/cpufreq/cpufreq_governor.c | 11 +- drivers/cpufreq/cpufreq_governor.h | 4 +- drivers/cpufreq/cpufreq_ondemand.c | 20 +- drivers/cpufreq/cpufreq_stats.c | 7 +- drivers/cpufreq/intel_pstate.c | 12 +- drivers/cpufreq/loongson2_cpufreq.c | 11 +- drivers/cpuidle/coupled.c | 127 +- drivers/cpuidle/governors/menu.c | 106 +- drivers/crypto/caam/caamhash.c | 2 +- drivers/dma/pl330.c | 97 +- drivers/edac/amd64_edac.c | 9 +- drivers/edac/edac_mc.c | 9 + drivers/edac/edac_mc_sysfs.c | 28 +- drivers/edac/i5100_edac.c | 2 +- drivers/firewire/core-cdev.c | 3 + drivers/firewire/ohci.c | 10 +- drivers/gpu/drm/ast/ast_ttm.c | 1 + drivers/gpu/drm/cirrus/cirrus_ttm.c | 1 + drivers/gpu/drm/drm_edid.c | 3 + drivers/gpu/drm/drm_gem.c | 18 +- drivers/gpu/drm/drm_irq.c | 5 +- drivers/gpu/drm/i915/i915_dma.c | 18 +- drivers/gpu/drm/i915/i915_drv.c | 13 +- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_gem.c | 57 +- drivers/gpu/drm/i915/i915_gem_context.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 13 +- drivers/gpu/drm/i915/i915_reg.h | 32 +- drivers/gpu/drm/i915/intel_ddi.c | 10 +- drivers/gpu/drm/i915/intel_display.c | 47 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_panel.c | 3 +- drivers/gpu/drm/i915/intel_pm.c | 47 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 21 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 3 +- drivers/gpu/drm/mgag200/mgag200_main.c | 2 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 70 +- drivers/gpu/drm/mgag200/mgag200_ttm.c | 1 + .../gpu/drm/nouveau/core/engine/disp/hdminva3.c | 4 + drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 6 +- drivers/gpu/drm/nouveau/core/include/subdev/mc.h | 7 +- drivers/gpu/drm/nouveau/core/subdev/mc/base.c | 6 +- drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c | 3 +- drivers/gpu/drm/nouveau/core/subdev/mc/nv44.c | 3 +- drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c | 3 +- drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c | 3 +- drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c | 3 +- drivers/gpu/drm/nouveau/core/subdev/vm/base.c | 6 +- drivers/gpu/drm/nouveau/nv17_fence.c | 2 +- drivers/gpu/drm/nouveau/nv50_fence.c | 14 +- drivers/gpu/drm/radeon/atom.c | 5 + drivers/gpu/drm/radeon/atombios_dp.c | 43 +- drivers/gpu/drm/radeon/atombios_encoders.c | 7 + drivers/gpu/drm/radeon/evergreen.c | 6 +- drivers/gpu/drm/radeon/evergreen_hdmi.c | 19 +- drivers/gpu/drm/radeon/ni.c | 6 +- drivers/gpu/drm/radeon/r600.c | 33 +- drivers/gpu/drm/radeon/r600_hdmi.c | 29 +- drivers/gpu/drm/radeon/radeon.h | 4 +- drivers/gpu/drm/radeon/radeon_asic.c | 8 +- drivers/gpu/drm/radeon/radeon_asic.h | 2 +- drivers/gpu/drm/radeon/radeon_combios.c | 159 +- drivers/gpu/drm/radeon/radeon_gart.c | 1 + drivers/gpu/drm/radeon/radeon_irq_kms.c | 9 +- drivers/gpu/drm/radeon/radeon_object.h | 2 +- drivers/gpu/drm/radeon/radeon_ring.c | 1 + drivers/gpu/drm/radeon/radeon_sa.c | 7 +- drivers/gpu/drm/radeon/radeon_uvd.c | 126 +- drivers/gpu/drm/radeon/rv770.c | 17 +- drivers/gpu/drm/radeon/si.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 58 +- drivers/hid/hid-apple.c | 6 + drivers/hid/hid-core.c | 23 +- drivers/hid/hid-ids.h | 4 + drivers/hid/hid-input.c | 12 +- drivers/hid/hid-ntrig.c | 3 +- drivers/hid/hid-picolcd_cir.c | 3 +- drivers/hid/hid-picolcd_core.c | 2 +- drivers/hid/hid-picolcd_fb.c | 6 +- drivers/hid/hid-pl.c | 10 +- drivers/hid/hid-sensor-hub.c | 3 +- drivers/hid/hid-speedlink.c | 11 +- drivers/hid/hidraw.c | 60 +- drivers/hid/usbhid/hid-quirks.c | 2 + drivers/hv/hv_balloon.c | 21 +- drivers/hv/ring_buffer.c | 10 +- drivers/hv/vmbus_drv.c | 2 +- drivers/hwmon/Kconfig | 4 +- drivers/hwmon/adt7470.c | 2 +- drivers/hwmon/k10temp.c | 3 +- drivers/hwmon/max6697.c | 4 +- drivers/hwmon/nct6775.c | 92 +- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/i2c-mxs.c | 2 +- drivers/i2c/busses/i2c-piix4.c | 3 +- drivers/iio/inkern.c | 2 +- drivers/infiniband/ulp/isert/ib_isert.c | 119 +- drivers/infiniband/ulp/isert/ib_isert.h | 1 + drivers/input/mouse/bcm5974.c | 36 +- drivers/iommu/amd_iommu.c | 6 +- drivers/iommu/intel-iommu.c | 72 +- drivers/leds/leds-wm831x-status.c | 4 +- drivers/macintosh/windfarm_rm31.c | 18 +- drivers/md/bcache/bcache.h | 1 + drivers/md/bcache/btree.c | 27 +- drivers/md/bcache/closure.c | 6 +- drivers/md/bcache/io.c | 2 + drivers/md/bcache/journal.c | 9 +- drivers/md/bcache/request.c | 21 +- drivers/md/bcache/super.c | 31 +- drivers/md/dm-ioctl.c | 3 + drivers/md/dm-mpath.c | 8 +- drivers/md/dm-verity.c | 5 +- drivers/md/dm.c | 9 +- drivers/md/md.c | 14 - drivers/md/raid1.c | 53 +- drivers/md/raid10.c | 32 +- drivers/md/raid5.c | 15 +- drivers/md/raid5.h | 1 + drivers/media/common/siano/smsdvb-main.c | 3 +- drivers/media/dvb-core/dmxdev.c | 8 +- drivers/media/dvb-frontends/mb86a20s.c | 16 +- drivers/media/pci/saa7134/saa7134-alsa.c | 2 + drivers/media/platform/coda.c | 2 +- drivers/media/platform/exynos-gsc/gsc-core.c | 9 +- drivers/media/platform/exynos-gsc/gsc-core.h | 1 + drivers/media/platform/exynos-gsc/gsc-m2m.c | 1 + drivers/media/platform/exynos4-is/media-dev.c | 2 +- drivers/media/platform/s5p-g2d/g2d.c | 1 + drivers/media/usb/em28xx/em28xx-i2c.c | 2 +- drivers/media/usb/hdpvr/hdpvr-core.c | 11 +- drivers/misc/hpilo.c | 4 +- drivers/misc/mei/hw-me.c | 22 +- drivers/misc/mei/init.c | 3 +- drivers/mmc/host/tmio_mmc_dma.c | 4 +- drivers/mtd/nand/Kconfig | 2 +- drivers/mtd/nand/nand_base.c | 8 +- drivers/mtd/ubi/wl.c | 3 + drivers/net/arcnet/arcnet.c | 2 +- drivers/net/bonding/bond_main.c | 8 +- drivers/net/can/usb/peak_usb/pcan_usb.c | 2 +- drivers/net/dummy.c | 4 + drivers/net/ethernet/atheros/alx/main.c | 5 +- drivers/net/ethernet/atheros/atl1c/atl1c.h | 3 + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 40 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 50 +- drivers/net/ethernet/broadcom/tg3.c | 18 +- drivers/net/ethernet/cadence/macb.c | 2 +- drivers/net/ethernet/emulex/benet/be_main.c | 16 +- drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 3 +- drivers/net/ethernet/marvell/mvneta.c | 13 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 11 +- drivers/net/ethernet/mellanox/mlx4/main.c | 2 +- drivers/net/ethernet/realtek/8139cp.c | 49 +- drivers/net/ethernet/sfc/filter.c | 6 +- drivers/net/ethernet/sfc/rx.c | 27 +- drivers/net/ethernet/sun/sunvnet.c | 2 + drivers/net/hyperv/netvsc_drv.c | 4 +- drivers/net/ifb.c | 8 +- drivers/net/macvlan.c | 4 + drivers/net/macvtap.c | 66 +- drivers/net/tun.c | 75 +- drivers/net/usb/ax88179_178a.c | 9 +- drivers/net/usb/cdc_mbim.c | 4 + drivers/net/usb/smsc75xx.c | 12 +- drivers/net/virtio_net.c | 5 +- drivers/net/vxlan.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 8 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 4 + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 + drivers/net/wireless/ath/ath9k/ath9k.h | 5 +- drivers/net/wireless/ath/ath9k/calib.c | 1 - drivers/net/wireless/ath/ath9k/hif_usb.c | 4 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 10 + drivers/net/wireless/ath/ath9k/hw.c | 3 +- drivers/net/wireless/ath/ath9k/init.c | 3 +- drivers/net/wireless/ath/ath9k/main.c | 10 +- drivers/net/wireless/ath/ath9k/recv.c | 17 +- drivers/net/wireless/ath/ath9k/xmit.c | 1 + drivers/net/wireless/ath/carl9170/main.c | 3 +- drivers/net/wireless/ath/wil6210/debugfs.c | 4 +- drivers/net/wireless/b43/Kconfig | 4 +- drivers/net/wireless/brcm80211/brcmsmac/dma.c | 15 +- drivers/net/wireless/hostap/hostap_ioctl.c | 4 +- drivers/net/wireless/iwlegacy/4965-mac.c | 18 +- drivers/net/wireless/iwlegacy/common.c | 1 + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 5 +- drivers/net/wireless/iwlwifi/dvm/main.c | 2 +- drivers/net/wireless/iwlwifi/iwl-7000.c | 12 +- drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 4 +- drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 8 +- drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 1 - drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 11 +- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 22 +- drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 + drivers/net/wireless/iwlwifi/mvm/scan.c | 15 +- drivers/net/wireless/iwlwifi/mvm/sta.c | 30 +- drivers/net/wireless/iwlwifi/mvm/tx.c | 6 +- drivers/net/wireless/iwlwifi/pcie/drv.c | 1 + drivers/net/wireless/iwlwifi/pcie/trans.c | 10 +- drivers/net/wireless/iwlwifi/pcie/tx.c | 13 + drivers/net/wireless/mwifiex/cfg80211.c | 4 +- drivers/net/wireless/mwifiex/cfp.c | 3 +- drivers/net/wireless/mwifiex/join.c | 6 +- drivers/net/wireless/mwifiex/main.c | 14 - drivers/net/wireless/mwifiex/sdio.c | 4 +- drivers/net/wireless/rt2x00/rt2800lib.c | 9 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 18 +- drivers/net/wireless/rt2x00/rt61pci.c | 3 +- drivers/net/wireless/rt2x00/rt73usb.c | 3 +- drivers/net/wireless/rtlwifi/pci.c | 13 - drivers/net/wireless/rtlwifi/ps.c | 12 + drivers/net/wireless/rtlwifi/ps.h | 1 + drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 + drivers/net/wireless/rtlwifi/rtl8723ae/sw.c | 6 +- drivers/net/wireless/rtlwifi/usb.c | 2 + drivers/net/wireless/zd1201.c | 4 +- drivers/net/xen-netfront.c | 31 +- drivers/of/address.c | 8 +- drivers/of/base.c | 1 + drivers/of/fdt.c | 2 + drivers/parisc/iosapic.c | 38 +- drivers/parisc/lba_pci.c | 56 + drivers/pci/hotplug/pciehp_pci.c | 9 +- drivers/pci/iov.c | 5 +- drivers/pci/pci-acpi.c | 15 +- drivers/pci/probe.c | 14 +- drivers/pci/quirks.c | 2 + drivers/pci/setup-bus.c | 69 +- drivers/pci/xen-pcifront.c | 7 +- drivers/pcmcia/at91_cf.c | 4 +- drivers/pinctrl/pinctrl-at91.c | 4 +- drivers/platform/olpc/olpc-ec.c | 2 +- drivers/power/charger-manager.c | 2 +- drivers/rapidio/switches/idt_gen2.c | 2 + drivers/rtc/rtc-max77686.c | 4 +- drivers/rtc/rtc-rv3029c2.c | 2 +- drivers/s390/scsi/zfcp_aux.c | 5 +- drivers/s390/scsi/zfcp_erp.c | 29 +- drivers/s390/scsi/zfcp_fsf.c | 27 +- drivers/s390/scsi/zfcp_qdio.c | 8 +- drivers/s390/scsi/zfcp_scsi.c | 10 +- drivers/scsi/Kconfig | 1 - drivers/scsi/aacraid/src.c | 3 + drivers/scsi/isci/task.c | 9 +- drivers/scsi/megaraid/megaraid_sas_base.c | 30 +- drivers/scsi/mpt2sas/mpt2sas_base.c | 13 +- drivers/scsi/mpt2sas/mpt2sas_base.h | 3 + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 14 +- drivers/scsi/mpt3sas/Makefile | 2 +- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 30 +- drivers/scsi/nsp32.c | 2 +- drivers/scsi/osd/osd_uld.c | 2 +- drivers/scsi/pm8001/pm8001_hwi.c | 4 +- drivers/scsi/pm8001/pm80xx_hwi.c | 4 +- drivers/scsi/qla2xxx/qla_iocb.c | 11 +- drivers/scsi/scsi.c | 11 +- drivers/scsi/sd.c | 81 +- drivers/scsi/sd.h | 1 + drivers/scsi/virtio_scsi.c | 2 +- drivers/spi/spi-davinci.c | 2 +- drivers/staging/android/logger.c | 4 +- drivers/staging/comedi/comedi_fops.c | 32 +- drivers/staging/comedi/drivers.c | 2 +- drivers/staging/comedi/drivers/dt282x.c | 3 +- drivers/staging/iio/adc/mxs-lradc.c | 18 +- drivers/staging/imx-drm/imx-drm-core.c | 1 + drivers/staging/line6/pcm.c | 5 +- drivers/staging/zcache/zcache-main.c | 6 +- drivers/staging/zram/zram_drv.c | 38 +- drivers/staging/zram/zram_drv.h | 5 +- drivers/staging/zram/zram_sysfs.c | 2 + drivers/target/iscsi/iscsi_target.c | 320 ++- drivers/target/iscsi/iscsi_target.h | 2 +- drivers/target/iscsi/iscsi_target_configfs.c | 2 +- drivers/target/iscsi/iscsi_target_core.h | 4 +- drivers/target/iscsi/iscsi_target_erl0.c | 8 +- drivers/target/iscsi/iscsi_target_erl1.c | 26 +- drivers/target/iscsi/iscsi_target_login.c | 9 +- drivers/target/iscsi/iscsi_target_util.c | 27 +- drivers/target/iscsi/iscsi_target_util.h | 3 +- drivers/target/target_core_alua.c | 2 +- drivers/target/target_core_pr.c | 2 +- drivers/target/target_core_spc.c | 9 +- drivers/tty/hvc/hvsi_lib.c | 4 +- drivers/tty/serial/8250/8250_gsc.c | 3 +- drivers/tty/serial/8250/8250_pci.c | 4 - drivers/tty/serial/arc_uart.c | 2 +- drivers/tty/serial/mxs-auart.c | 38 +- drivers/tty/serial/pch_uart.c | 5 + drivers/tty/tty_io.c | 5 +- drivers/tty/tty_port.c | 5 +- drivers/usb/class/cdc-wdm.c | 13 +- drivers/usb/core/config.c | 3 +- drivers/usb/core/hub.c | 118 +- drivers/usb/core/hub.h | 3 + drivers/usb/core/port.c | 13 +- drivers/usb/core/quirks.c | 6 + drivers/usb/dwc3/core.c | 2 +- drivers/usb/dwc3/core.h | 4 +- drivers/usb/dwc3/gadget.c | 40 +- drivers/usb/gadget/f_acm.c | 1 + drivers/usb/gadget/f_mass_storage.c | 2 + drivers/usb/gadget/udc-core.c | 2 +- drivers/usb/gadget/uvc_queue.c | 6 +- drivers/usb/host/ehci-hub.c | 1 + drivers/usb/host/ehci-mxc.c | 2 +- drivers/usb/host/ehci-omap.c | 11 +- drivers/usb/host/ehci-sched.c | 13 +- drivers/usb/host/ohci-pci.c | 2 +- drivers/usb/host/xhci-mem.c | 4 + drivers/usb/host/xhci-pci.c | 1 - drivers/usb/host/xhci-plat.c | 3 +- drivers/usb/host/xhci-ring.c | 2 +- drivers/usb/host/xhci.c | 42 +- drivers/usb/host/xhci.h | 1 + drivers/usb/misc/sisusbvga/sisusb.c | 1 + drivers/usb/phy/phy-fsl-usb.h | 2 +- drivers/usb/phy/phy-fsm-usb.c | 2 +- drivers/usb/serial/cp210x.c | 4 + drivers/usb/serial/ftdi_sio.c | 31 +- drivers/usb/serial/ftdi_sio_ids.h | 34 +- drivers/usb/serial/keyspan.c | 2 +- drivers/usb/serial/mos7720.c | 21 +- drivers/usb/serial/mos7840.c | 175 +- drivers/usb/serial/option.c | 27 +- drivers/usb/serial/qcserial.c | 8 +- drivers/usb/serial/ti_usb_3410_5052.c | 11 +- drivers/usb/serial/usb_wwan.c | 20 +- drivers/usb/storage/unusual_devs.h | 7 + drivers/usb/wusbcore/wa-xfer.c | 9 +- drivers/vhost/net.c | 18 +- drivers/virtio/virtio_balloon.c | 3 +- drivers/virtio/virtio_ring.c | 56 +- drivers/xen/events.c | 13 +- drivers/xen/evtchn.c | 21 +- drivers/xen/grant-table.c | 13 +- fs/bio.c | 20 +- fs/block_dev.c | 9 +- fs/btrfs/ctree.c | 13 +- fs/btrfs/extent-tree.c | 13 + fs/btrfs/ioctl.c | 3 + fs/btrfs/scrub.c | 2 +- fs/btrfs/send.c | 35 + fs/btrfs/tree-log.c | 5 +- fs/btrfs/ulist.c | 15 + fs/ceph/ioctl.c | 4 +- fs/ceph/xattr.c | 9 +- fs/cifs/cifs_unicode.h | 8 +- fs/cifs/cifsencrypt.c | 8 +- fs/cifs/cifsglob.h | 1 + fs/cifs/connect.c | 9 +- fs/cifs/file.c | 9 +- fs/cifs/inode.c | 5 + fs/cifs/readdir.c | 8 + fs/cifs/sess.c | 6 +- fs/cifs/smb2misc.c | 148 +- fs/debugfs/inode.c | 69 +- fs/exec.c | 4 +- fs/ext3/namei.c | 7 +- fs/ext4/balloc.c | 4 +- fs/ext4/ext4_jbd2.c | 8 +- fs/ext4/extents.c | 15 +- fs/ext4/file.c | 14 +- fs/ext4/ialloc.c | 10 +- fs/ext4/inline.c | 2 +- fs/ext4/inode.c | 124 +- fs/ext4/ioctl.c | 6 +- fs/ext4/mballoc.c | 11 +- fs/ext4/namei.c | 7 +- fs/ext4/resize.c | 4 +- fs/ext4/super.c | 34 +- fs/fuse/dir.c | 55 +- fs/fuse/file.c | 11 +- fs/fuse/fuse_i.h | 2 + fs/fuse/inode.c | 3 +- fs/hpfs/map.c | 3 +- fs/hpfs/super.c | 8 +- fs/isofs/inode.c | 16 +- fs/jbd2/journal.c | 3 +- fs/jbd2/transaction.c | 2 +- fs/jfs/jfs_dtree.c | 31 +- fs/lockd/clntlock.c | 13 +- fs/lockd/clntproc.c | 5 +- fs/lockd/svclock.c | 4 + fs/namespace.c | 2 +- fs/nfs/nfs4state.c | 23 +- fs/nfsd/nfs4xdr.c | 2 +- fs/nfsd/vfs.c | 5 +- fs/nilfs2/segbuf.c | 5 +- fs/notify/fanotify/fanotify_user.c | 1 + fs/ocfs2/extent_map.c | 1 - fs/ocfs2/xattr.c | 10 + fs/proc/root.c | 3 +- fs/proc/task_mmu.c | 8 +- fs/reiserfs/procfs.c | 99 +- fs/reiserfs/super.c | 3 +- fs/super.c | 25 +- fs/ubifs/super.c | 2 +- include/acpi/acpi_bus.h | 6 +- include/asm-generic/tlb.h | 2 +- .../kvm/arm_arch_timer.h | 18 + include/kvm/arm_vgic.h | 370 +++ include/linux/ceph/decode.h | 5 - include/linux/cgroup.h | 58 +- include/linux/compat.h | 7 + include/linux/cpu_cooling.h | 4 +- include/linux/edac.h | 7 +- include/linux/elevator.h | 6 +- include/linux/firewire.h | 1 + include/linux/ftrace_event.h | 12 +- include/linux/hid.h | 4 +- include/linux/hugetlb.h | 16 + include/linux/if_vlan.h | 3 +- include/linux/iio/iio.h | 4 +- include/linux/ipv6.h | 1 + include/linux/irqchip/arm-gic.h | 12 + include/linux/kvm_host.h | 108 +- include/linux/kvm_types.h | 14 + include/linux/mm.h | 3 + include/linux/mm_types.h | 1 + include/linux/nbd.h | 1 + include/linux/pci_ids.h | 2 + include/linux/rculist.h | 5 +- include/linux/regmap.h | 2 + include/linux/signal.h | 8 + include/linux/sunrpc/sched.h | 1 + include/linux/syscalls.h | 5 + include/linux/tick.h | 6 - include/linux/usb/hcd.h | 2 +- include/linux/user_namespace.h | 1 + include/linux/virtio.h | 4 + include/linux/wait.h | 57 + include/media/v4l2-ctrls.h | 1 + include/net/addrconf.h | 3 + include/net/genetlink.h | 20 +- include/net/ip_tunnels.h | 14 - include/net/mac80211.h | 1 + include/net/ndisc.h | 2 +- include/net/sch_generic.h | 9 +- include/net/udp.h | 1 + include/target/iscsi/iscsi_transport.h | 9 +- include/trace/events/kvm.h | 18 +- include/uapi/linux/Kbuild | 1 + include/uapi/linux/firewire-cdev.h | 4 +- include/uapi/linux/icmpv6.h | 2 + include/uapi/linux/if_pppox.h | 4 +- include/uapi/linux/kvm.h | 46 +- include/uapi/linux/pkt_sched.h | 10 +- include/uapi/linux/psci.h | 90 + ipc/msg.c | 5 +- kernel/cgroup.c | 34 +- kernel/cpuset.c | 6 +- kernel/events/core.c | 28 +- kernel/events/uprobes.c | 4 +- kernel/fork.c | 13 +- kernel/futex.c | 3 +- kernel/hrtimer.c | 28 +- kernel/irq/manage.c | 6 +- kernel/module.c | 34 +- kernel/pid.c | 1 + kernel/power/autosleep.c | 3 +- kernel/power/qos.c | 13 +- kernel/printk.c | 2 +- kernel/sched/fair.c | 1 + kernel/time/tick-broadcast.c | 80 +- kernel/time/tick-common.c | 3 +- kernel/time/tick-sched.c | 9 +- kernel/time/timer_list.c | 41 +- kernel/timer.c | 8 +- kernel/trace/ftrace.c | 89 +- kernel/trace/trace.c | 443 +++- kernel/trace/trace.h | 5 + kernel/trace/trace_events.c | 305 ++- kernel/trace/trace_events_filter.c | 17 +- kernel/trace/trace_irqsoff.c | 4 +- kernel/trace/trace_kprobe.c | 42 +- kernel/trace/trace_syscalls.c | 21 +- kernel/trace/trace_uprobe.c | 55 +- kernel/user_namespace.c | 17 +- kernel/workqueue.c | 21 + lib/Kconfig.debug | 2 +- mm/huge_memory.c | 2 + mm/hugetlb.c | 19 +- mm/memcontrol.c | 22 +- mm/memory.c | 35 +- mm/mempolicy.c | 6 +- mm/mmap.c | 6 +- mm/page_alloc.c | 4 + mm/slab.c | 2 +- mm/slab.h | 2 + net/8021q/vlan_core.c | 2 +- net/8021q/vlan_dev.c | 7 + net/9p/trans_common.c | 10 +- net/bridge/br_fdb.c | 10 +- net/bridge/br_multicast.c | 5 +- net/bridge/br_netlink.c | 4 +- net/bridge/br_vlan.c | 4 +- net/ceph/auth_none.c | 6 + net/ceph/osd_client.c | 2 + net/ceph/osdmap.c | 2 +- net/core/dev.c | 11 +- net/core/flow_dissector.c | 11 +- net/core/neighbour.c | 22 +- net/core/rtnetlink.c | 4 +- net/core/scm.c | 2 +- net/core/sysctl_net_core.c | 6 +- net/ipv4/devinet.c | 4 +- net/ipv4/fib_trie.c | 5 +- net/ipv4/ip_gre.c | 11 +- net/ipv4/ip_input.c | 7 +- net/ipv4/ip_tunnel.c | 99 +- net/ipv4/ip_vti.c | 7 - net/ipv4/ipip.c | 12 +- net/ipv4/raw.c | 3 +- net/ipv4/sysctl_net_ipv4.c | 6 +- net/ipv4/tcp.c | 7 + net/ipv4/tcp_cubic.c | 12 +- net/ipv4/tcp_input.c | 9 +- net/ipv4/tcp_output.c | 4 +- net/ipv4/udp.c | 3 +- net/ipv6/addrconf.c | 38 +- net/ipv6/addrlabel.c | 48 +- net/ipv6/icmp.c | 10 +- net/ipv6/ip6_fib.c | 31 +- net/ipv6/ip6_output.c | 16 +- net/ipv6/ip6mr.c | 5 + net/ipv6/mcast.c | 18 +- net/ipv6/ndisc.c | 14 +- net/ipv6/reassembly.c | 5 + net/ipv6/route.c | 70 +- net/ipv6/sit.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- net/ipv6/udp.c | 7 +- net/key/af_key.c | 4 + net/l2tp/l2tp_ppp.c | 3 +- net/mac80211/cfg.c | 2 + net/mac80211/ibss.c | 1 + net/mac80211/iface.c | 9 + net/mac80211/mlme.c | 54 +- net/mac80211/pm.c | 7 +- net/mac80211/rc80211_minstrel.c | 3 +- net/mac80211/rc80211_minstrel_ht.c | 13 +- net/mac80211/rx.c | 10 +- net/netlink/genetlink.c | 69 +- net/nfc/llcp.h | 1 + net/nfc/llcp_sock.c | 8 +- net/packet/af_packet.c | 2 + net/sched/sch_api.c | 41 + net/sched/sch_atm.c | 1 + net/sched/sch_cbq.c | 1 + net/sched/sch_generic.c | 1 + net/sched/sch_htb.c | 15 +- net/sched/sch_qfq.c | 85 +- net/sunrpc/auth_gss/gss_rpc_upcall.c | 3 +- net/sunrpc/auth_gss/gss_rpc_xdr.c | 9 +- net/sunrpc/clnt.c | 4 + net/sunrpc/netns.h | 1 + net/sunrpc/rpcb_clnt.c | 48 +- net/sunrpc/svcauth_unix.c | 2 - net/sunrpc/svcsock.c | 9 +- net/sunrpc/xdr.c | 9 +- net/sunrpc/xprtrdma/svc_rdma_marshal.c | 20 +- net/tipc/socket.c | 4 +- net/wireless/core.c | 1 + net/wireless/nl80211.c | 13 +- net/x25/af_x25.c | 15 +- sound/arm/pxa2xx-pcm-lib.c | 2 + sound/core/compress_offload.c | 2 +- sound/core/seq/oss/seq_oss_init.c | 16 +- sound/core/seq/oss/seq_oss_midi.c | 2 +- sound/isa/opti9xx/opti92x-ad1848.c | 8 +- sound/pci/asihpi/asihpi.c | 3 + sound/pci/atiixp.c | 2 + sound/pci/atiixp_modem.c | 2 + sound/pci/hda/hda_auto_parser.c | 2 +- sound/pci/hda/hda_generic.c | 8 +- sound/pci/hda/hda_intel.c | 1 + sound/pci/hda/hda_local.h | 10 +- sound/pci/hda/patch_analog.c | 12 +- sound/pci/hda/patch_hdmi.c | 59 +- sound/pci/hda/patch_realtek.c | 15 + sound/pci/hda/patch_sigmatel.c | 14 +- sound/pci/hda/patch_via.c | 2 + sound/soc/atmel/atmel-pcm-dma.c | 2 + sound/soc/codecs/cs42l52.c | 2 +- sound/soc/codecs/max98088.c | 2 +- sound/soc/codecs/mc13783.c | 4 + sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/codecs/sgtl5000.h | 2 +- sound/soc/codecs/wm8960.c | 6 +- sound/soc/codecs/wm8962.c | 24 +- sound/soc/s6000/s6000-pcm.c | 2 + sound/soc/soc-dapm.c | 7 +- sound/soc/tegra/tegra20_ac97.c | 6 +- sound/soc/tegra/tegra20_spdif.c | 4 +- sound/soc/tegra/tegra30_i2s.c | 2 +- sound/usb/6fire/comm.c | 38 +- sound/usb/6fire/comm.h | 2 +- sound/usb/6fire/midi.c | 16 +- sound/usb/6fire/midi.h | 6 +- sound/usb/6fire/pcm.c | 55 +- sound/usb/6fire/pcm.h | 2 +- sound/usb/endpoint.c | 13 +- sound/usb/misc/ua101.c | 14 +- sound/usb/mixer.c | 1 + sound/usb/usx2y/usbusx2yaudio.c | 4 + tools/hv/hv_kvp_daemon.c | 5 +- tools/perf/config/utilities.mak | 2 +- virt/kvm/Kconfig | 10 + {arch/arm/kvm => virt/kvm/arm}/arch_timer.c | 68 +- virt/kvm/arm/vgic-v2.c | 265 +++ virt/kvm/arm/vgic-v3.c | 247 ++ virt/kvm/arm/vgic.c | 2464 ++++++++++++++++++++ virt/kvm/async_pf.c | 60 +- virt/kvm/coalesced_mmio.c | 8 +- virt/kvm/eventfd.c | 154 +- virt/kvm/ioapic.c | 2 +- virt/kvm/ioapic.h | 1 - virt/kvm/iommu.c | 12 +- virt/kvm/irq_comm.c | 41 +- virt/kvm/irqchip.c | 107 +- virt/kvm/kvm_main.c | 391 ++-- virt/kvm/vfio.c | 228 ++ 938 files changed, 21248 insertions(+), 7327 deletions(-) create mode 100644 Documentation/virtual/kvm/devices/arm-vgic.txt create mode 100644 Documentation/virtual/kvm/devices/vfio.txt delete mode 100644 arch/arm/include/asm/a.out-core.h delete mode 100644 arch/arm/include/asm/kvm_vgic.h delete mode 100644 arch/arm/include/uapi/asm/a.out.h delete mode 100644 arch/arm/kernel/signal.h create mode 100644 arch/arm/kvm/coproc_a7.c delete mode 100644 arch/arm/kvm/vgic.c create mode 100644 arch/arm64/include/asm/kvm_arm.h create mode 100644 arch/arm64/include/asm/kvm_asm.h create mode 100644 arch/arm64/include/asm/kvm_coproc.h create mode 100644 arch/arm64/include/asm/kvm_emulate.h create mode 100644 arch/arm64/include/asm/kvm_host.h create mode 100644 arch/arm64/include/asm/kvm_mmio.h create mode 100644 arch/arm64/include/asm/kvm_mmu.h create mode 100644 arch/arm64/include/asm/kvm_psci.h create mode 100644 arch/arm64/include/uapi/asm/kvm.h create mode 100644 arch/arm64/kvm/Kconfig create mode 100644 arch/arm64/kvm/Makefile create mode 100644 arch/arm64/kvm/emulate.c create mode 100644 arch/arm64/kvm/guest.c create mode 100644 arch/arm64/kvm/handle_exit.c create mode 100644 arch/arm64/kvm/hyp-init.S create mode 100644 arch/arm64/kvm/hyp.S create mode 100644 arch/arm64/kvm/inject_fault.c create mode 100644 arch/arm64/kvm/regmap.c create mode 100644 arch/arm64/kvm/reset.c create mode 100644 arch/arm64/kvm/sys_regs.c create mode 100644 arch/arm64/kvm/sys_regs.h create mode 100644 arch/arm64/kvm/sys_regs_generic_v8.c create mode 100644 arch/arm64/kvm/vgic-v2-switch.S create mode 100644 arch/arm64/kvm/vgic-v3-switch.S create mode 100644 arch/um/kernel/maccess.c create mode 100644 drivers/acpi/acpi_cmos_rtc.c rename arch/arm/include/asm/kvm_arch_timer.h => include/kvm/arm_arch_timer.h (81%) create mode 100644 include/kvm/arm_vgic.h create mode 100644 include/uapi/linux/psci.h rename {arch/arm/kvm => virt/kvm/arm}/arch_timer.c (81%) create mode 100644 virt/kvm/arm/vgic-v2.c create mode 100644 virt/kvm/arm/vgic-v3.c create mode 100644 virt/kvm/arm/vgic.c create mode 100644 virt/kvm/vfio.c