1. 08 5月, 2012 1 次提交
    • A
      Merge branch 'for-upstream' of git://github.com/agraf/linux-2.6 into next · f2569053
      Avi Kivity 提交于
      PPC updates from Alex.
      
      * 'for-upstream' of git://github.com/agraf/linux-2.6:
        KVM: PPC: Emulator: clean up SPR reads and writes
        KVM: PPC: Emulator: clean up instruction parsing
        kvm/powerpc: Add new ioctl to retreive server MMU infos
        kvm/book3s: Make kernel emulated H_PUT_TCE available for "PR" KVM
        KVM: PPC: bookehv: Fix r8/r13 storing in level exception handler
        KVM: PPC: Book3S: Enable IRQs during exit handling
        KVM: PPC: Fix PR KVM on POWER7 bare metal
        KVM: PPC: Fix stbux emulation
        KVM: PPC: bookehv: Use lwz/stw instead of PPC_LL/PPC_STL for 32-bit fields
        KVM: PPC: Book3S: PR: No isync in slbie path
        KVM: PPC: Book3S: PR: Optimize entry path
        KVM: PPC: booke(hv): Fix save/restore of guest accessible SPRGs.
        KVM: PPC: Restrict PPC_[L|ST]D macro to asm code
        KVM: PPC: bookehv: Use a Macro for saving/restoring guest registers to/from their 64 bit copies.
        KVM: PPC: Use clockevent multiplier and shifter for decrementer
        KVM: Use minimum and maximum address mapped by TLB1
      Signed-off-by: NAvi Kivity <avi@redhat.com>
      f2569053
  2. 06 5月, 2012 20 次提交
  3. 03 5月, 2012 1 次提交
  4. 01 5月, 2012 3 次提交
  5. 28 4月, 2012 3 次提交
  6. 24 4月, 2012 3 次提交
  7. 21 4月, 2012 1 次提交
  8. 20 4月, 2012 5 次提交
    • A
      KVM: ia64: fix build due to typo · 8281715b
      Avi Kivity 提交于
      s/kcm/kvm/.
      Signed-off-by: NAvi Kivity <avi@redhat.com>
      Signed-off-by: NMarcelo Tosatti <mtosatti@redhat.com>
      8281715b
    • A
      KVM: Fix page-crossing MMIO · f78146b0
      Avi Kivity 提交于
      MMIO that are split across a page boundary are currently broken - the
      code does not expect to be aborted by the exit to userspace for the
      first MMIO fragment.
      
      This patch fixes the problem by generalizing the current code for handling
      16-byte MMIOs to handle a number of "fragments", and changes the MMIO
      code to create those fragments.
      Signed-off-by: NAvi Kivity <avi@redhat.com>
      Signed-off-by: NMarcelo Tosatti <mtosatti@redhat.com>
      f78146b0
    • M
      Merge branch 'linus' into queue · eac05567
      Marcelo Tosatti 提交于
      Merge reason: development work has dependency on kvm patches merged
      upstream.
      
      Conflicts:
      	Documentation/feature-removal-schedule.txt
      Signed-off-by: NMarcelo Tosatti <mtosatti@redhat.com>
      eac05567
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 19853301
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "It's like a grab bag of one liners:
      
        - core: fix page flip error path, reorder object teardown.
        - usb: fix the drm_usb module license.
        - i915: VT switch on SNB with non-native modes fix, and a regression
          fix from 3.3.
        - radeon: missing unreserve on SI, AGP/VRAM setup fix (fixes radeon on
          IA64, but its a generic bug), an rn50 regression from 3.3, turn off
          MSIs on rv515 (it loses rearms every so often)."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        nouveau: Set special lane map for the right chipset
        drm/radeon: fix load detect on rn50 with hardcoded EDIDs.
        drm: Releasing FBs before releasing GEM objects during drm_release
        drm/nouveau/pm: don't read/write beyond end of stack buffer
        drivers: gpu: drm: gma500: mdfld_dsi_output.h: Remove not unneeded include of version.h
        radeon: fix r600/agp when vram is after AGP (v3)
        drm: fix page_flip error handling
        drm/radeon/kms: fix the regression of DVI connector check
        drm/usb: fix module license on drm/usb layer.
        drm/i915: Do not set "Enable Panel Fitter" on SNB pageflips
        drm/i915: Hold mode_config lock whilst changing mode for lastclose()
        drm/radeon/si: add missing radeon_bo_unreserve in si_rlc_init() v2
        drm/radeon: disable MSI on RV515
        drm/i915: don't clobber the special upscaling lvds timings
      19853301
    • L
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · 9e01297e
      Linus Torvalds 提交于
      Pull KVM updates from Marcelo Tosatti.
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: lock slots_lock around device assignment
        KVM: VMX: Fix kvm_set_shared_msr() called in preemptible context
        KVM: unmap pages from the iommu when slots are removed
        KVM: PMU emulation: GLOBAL_CTRL MSR should be enabled on reset
      9e01297e
  9. 19 4月, 2012 3 次提交