tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM fixes from Paolo Bonzini:
"Two small x86 patches, improving "make kvmconfig" and fixing an
objtool warning for CONFIG_PROFILE_ALL_BRANCHES"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
kvmconfig: add more virtio drivers
x86/kvm: Add stack frame dependency to fastop() inline asm

Linus Torvalds d32917ee c5114626

+8 -1
+3
arch/x86/configs/kvm_guest.config
··· 26 26 CONFIG_9P_FS=y 27 27 CONFIG_NET_9P=y 28 28 CONFIG_NET_9P_VIRTIO=y 29 + CONFIG_SCSI_LOWLEVEL=y 30 + CONFIG_SCSI_VIRTIO=y 31 + CONFIG_VIRTIO_INPUT=y
+5 -1
arch/x86/kvm/emulate.c
··· 5110 5110 5111 5111 static int fastop(struct x86_emulate_ctxt *ctxt, void (*fop)(struct fastop *)) 5112 5112 { 5113 + register void *__sp asm(_ASM_SP); 5113 5114 ulong flags = (ctxt->eflags & EFLAGS_MASK) | X86_EFLAGS_IF; 5115 + 5114 5116 if (!(ctxt->d & ByteOp)) 5115 5117 fop += __ffs(ctxt->dst.bytes) * FASTOP_SIZE; 5118 + 5116 5119 asm("push %[flags]; popf; call *%[fastop]; pushf; pop %[flags]\n" 5117 5120 : "+a"(ctxt->dst.val), "+d"(ctxt->src.val), [flags]"+D"(flags), 5118 - [fastop]"+S"(fop) 5121 + [fastop]"+S"(fop), "+r"(__sp) 5119 5122 : "c"(ctxt->src2.val)); 5123 + 5120 5124 ctxt->eflags = (ctxt->eflags & ~EFLAGS_MASK) | (flags & EFLAGS_MASK); 5121 5125 if (!fop) /* exception is returned in fop variable */ 5122 5126 return emulate_de(ctxt);