Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue

Conflicts:
	arch/powerpc/include/asm/processor.h

diff --cc Documentation/virtual/kvm/api.txt
Simple merge

diff --cc arch/powerpc/include/asm/processor.h
index ce4de5a,b438444..75a9e5a
--- 1/arch/powerpc/include/asm/processor.h
--- 2/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@@ -198,6 -184,27 +184,27 @@@ struct debug_reg 
        unsigned long   dvc2;
  #endif
  #endif
 -      unsigned long   ksp_limit;      /* if ksp <= ksp_limit stack overflow */
+ };
+ 
+ struct thread_struct {
+       unsigned long   ksp;            /* Kernel stack pointer */
+ 
+ #ifdef CONFIG_PPC64
+       unsigned long   ksp_vsid;
+ #endif
+       struct pt_regs  *regs;          /* Pointer to saved register state */
+       mm_segment_t    fs;             /* for get_fs() validation */
+ #ifdef CONFIG_BOOKE
+       /* BookE base exception scratch space; align on cacheline */
+       unsigned long   normsave[8] ____cacheline_aligned;
+ #endif
+ #ifdef CONFIG_PPC32
+       void            *pgdir;         /* root of page-table tree */
++      unsigned long   ksp_limit;      /* if ksp <= ksp_limit stack overflow */
+ #endif
+       /* Debug Registers */
+       struct debug_reg debug;
+ 
        /* FP and VSX 0-31 register set */
        double          fpr[32][TS_FPRWIDTH] __attribute__((aligned(16)));
        struct {

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_hv_rmhandlers.S
Simple merge

diff --cc arch/powerpc/kvm/e500_mmu_host.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc include/linux/kvm_host.h
Simple merge

diff --cc include/uapi/linux/kvm.h
Simple merge

diff --cc virt/kvm/kvm_main.c
index 82c4047,0932c3b..7a317a7
--- 1/virt/kvm/kvm_main.c
--- 2/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@@ -883,23 -899,9 +884,23 @@@ int __kvm_set_memory_region(struct kvm 
  
        kvm_arch_commit_memory_region(kvm, mem, &old, change);
  
-       kvm_free_physmem_slot(&old, &new);
+       kvm_free_physmem_slot(kvm, &old, &new);
        kfree(old_memslots);
  
 +      /*
 +       * IOMMU mapping:  New slots need to be mapped.  Old slots need to be
 +       * un-mapped and re-mapped if their base changes.  Since base change
 +       * unmapping is handled above with slot deletion, mapping alone is
 +       * needed here.  Anything else the iommu might care about for existing
 +       * slots (size changes, userspace addr changes and read-only flag
 +       * changes) is disallowed above, so any other attribute changes getting
 +       * here can be skipped.
 +       */
 +      if ((change == KVM_MR_CREATE) || (change == KVM_MR_MOVE)) {
 +              r = kvm_iommu_map_pages(kvm, &new);
 +              return r;
 +      }
 +
        return 0;
  
  out_slots: