Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95f328d3 authored by Gleb Natapov's avatar Gleb Natapov
Browse files

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

Conflicts:
	arch/powerpc/include/asm/processor.h
parents daf72722 a78b55d1

Documentation/virtual/kvm/api.txt

+44 −0
Original line number Diff line number Diff line
@@ -1810,6 +1810,50 @@ registers, find a list below: 
  PPC   | KVM_REG_PPC_TLB3PS	| 32

  PPC   | KVM_REG_PPC_EPTCFG	| 32

  PPC   | KVM_REG_PPC_ICP_STATE | 64

  PPC   | KVM_REG_PPC_TB_OFFSET	| 64

  PPC   | KVM_REG_PPC_SPMC1	| 32

  PPC   | KVM_REG_PPC_SPMC2	| 32

  PPC   | KVM_REG_PPC_IAMR	| 64

  PPC   | KVM_REG_PPC_TFHAR	| 64

  PPC   | KVM_REG_PPC_TFIAR	| 64

  PPC   | KVM_REG_PPC_TEXASR	| 64

  PPC   | KVM_REG_PPC_FSCR	| 64

  PPC   | KVM_REG_PPC_PSPB	| 32

  PPC   | KVM_REG_PPC_EBBHR	| 64

  PPC   | KVM_REG_PPC_EBBRR	| 64

  PPC   | KVM_REG_PPC_BESCR	| 64

  PPC   | KVM_REG_PPC_TAR	| 64

  PPC   | KVM_REG_PPC_DPDES	| 64

  PPC   | KVM_REG_PPC_DAWR	| 64

  PPC   | KVM_REG_PPC_DAWRX	| 64

  PPC   | KVM_REG_PPC_CIABR	| 64

  PPC   | KVM_REG_PPC_IC	| 64

  PPC   | KVM_REG_PPC_VTB	| 64

  PPC   | KVM_REG_PPC_CSIGR	| 64

  PPC   | KVM_REG_PPC_TACR	| 64

  PPC   | KVM_REG_PPC_TCSCR	| 64

  PPC   | KVM_REG_PPC_PID	| 64

  PPC   | KVM_REG_PPC_ACOP	| 64

  PPC   | KVM_REG_PPC_VRSAVE	| 32

  PPC   | KVM_REG_PPC_LPCR	| 64

  PPC   | KVM_REG_PPC_PPR	| 64

  PPC   | KVM_REG_PPC_ARCH_COMPAT 32

  PPC   | KVM_REG_PPC_TM_GPR0	| 64

          ...

  PPC   | KVM_REG_PPC_TM_GPR31	| 64

  PPC   | KVM_REG_PPC_TM_VSR0	| 128

          ...

  PPC   | KVM_REG_PPC_TM_VSR63	| 128

  PPC   | KVM_REG_PPC_TM_CR	| 64

  PPC   | KVM_REG_PPC_TM_LR	| 64

  PPC   | KVM_REG_PPC_TM_CTR	| 64

  PPC   | KVM_REG_PPC_TM_FPSCR	| 64

  PPC   | KVM_REG_PPC_TM_AMR	| 64

  PPC   | KVM_REG_PPC_TM_PPR	| 64

  PPC   | KVM_REG_PPC_TM_VRSAVE	| 64

  PPC   | KVM_REG_PPC_TM_VSCR	| 32

  PPC   | KVM_REG_PPC_TM_DSCR	| 64

  PPC   | KVM_REG_PPC_TM_TAR	| 64



ARM registers are mapped using the lower 32 bits.  The upper 16 of that

is the register group type, or coprocessor number:

arch/arm/kvm/arm.c

+3 −2
Original line number Diff line number Diff line
@@ -152,12 +152,13 @@ int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf) 
	return VM_FAULT_SIGBUS;

}



void kvm_arch_free_memslot(struct kvm_memory_slot *free,

void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,

			   struct kvm_memory_slot *dont)

{

}



int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)

int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,

			    unsigned long npages)

{

	return 0;

}

arch/ia64/kvm/kvm-ia64.c

+3 −2
Original line number Diff line number Diff line
@@ -1550,12 +1550,13 @@ int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf) 
	return VM_FAULT_SIGBUS;

}



void kvm_arch_free_memslot(struct kvm_memory_slot *free,

void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,

			   struct kvm_memory_slot *dont)

{

}



int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)

int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,

			    unsigned long npages)

{

	return 0;

}

arch/mips/kvm/kvm_mips.c

+3 −2
Original line number Diff line number Diff line
@@ -198,12 +198,13 @@ kvm_arch_dev_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) 
	return -ENOIOCTLCMD;

}



void kvm_arch_free_memslot(struct kvm_memory_slot *free,

void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,

			   struct kvm_memory_slot *dont)

{

}



int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)

int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,

			    unsigned long npages)

{

	return 0;

}

arch/powerpc/include/asm/disassemble.h

+4 −0
Original line number Diff line number Diff line
@@ -77,4 +77,8 @@ static inline unsigned int get_d(u32 inst) 
	return inst & 0xffff;

}



static inline unsigned int get_oc(u32 inst)

{

	return (inst >> 11) & 0x7fff;

}

#endif /* __ASM_PPC_DISASSEMBLE_H__ */