diff for duplicates of <1368226020.19683.14@snotra> diff --git a/a/1.txt b/N1/1.txt index db21894..24a83fe 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,24 +4,24 @@ On 05/09/2013 11:40:08 PM, tiejun.chen wrote: >>> index 705fc5c..eb89b83 100644 >>> --- a/arch/powerpc/kvm/booke.c >>> +++ b/arch/powerpc/kvm/booke.c ->>> @@ -673,7 +673,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, =20 +>>> @@ -673,7 +673,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, >>> struct kvm_vcpu >>> *vcpu) ->>> ret =3D s; +>>> ret = s; >>> goto out; >>> } >>> - kvmppc_lazy_ee_enable(); >>> + kvmppc_fix_ee_before_entry(); ->>=20 +>> >> local_irq_disable() is called before kvmppc_prepare_to_enter(). ->=20 -> In patch 4, we call hard_irq_disable() once enter =20 +> +> In patch 4, we call hard_irq_disable() once enter > kvmppc_prepare_to_enter(). -And before patch 4, we have the code near the end of =20 -kvmppc_prepare_to_enter() that checks lazy_irq_pending() and aborts =20 -guest entry if there was a race. If I'd known about that bit of code =20 -beforehand, I probably wouldn't have bothered with most of patch 4/4, =20 +And before patch 4, we have the code near the end of +kvmppc_prepare_to_enter() that checks lazy_irq_pending() and aborts +guest entry if there was a race. If I'd known about that bit of code +beforehand, I probably wouldn't have bothered with most of patch 4/4, but now that it's been done it seems cleaner. --Scott= +-Scott diff --git a/a/content_digest b/N1/content_digest index acb5838..bcc58c5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -20,26 +20,26 @@ ">>> index 705fc5c..eb89b83 100644\n" ">>> --- a/arch/powerpc/kvm/booke.c\n" ">>> +++ b/arch/powerpc/kvm/booke.c\n" - ">>> @@ -673,7 +673,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, =20\n" + ">>> @@ -673,7 +673,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, \n" ">>> struct kvm_vcpu\n" ">>> *vcpu)\n" - ">>> \t\tret =3D s;\n" + ">>> \t\tret = s;\n" ">>> \t\tgoto out;\n" ">>> \t}\n" ">>> -\tkvmppc_lazy_ee_enable();\n" ">>> +\tkvmppc_fix_ee_before_entry();\n" - ">>=20\n" + ">> \n" ">> local_irq_disable() is called before kvmppc_prepare_to_enter().\n" - ">=20\n" - "> In patch 4, we call hard_irq_disable() once enter =20\n" + "> \n" + "> In patch 4, we call hard_irq_disable() once enter \n" "> kvmppc_prepare_to_enter().\n" "\n" - "And before patch 4, we have the code near the end of =20\n" - "kvmppc_prepare_to_enter() that checks lazy_irq_pending() and aborts =20\n" - "guest entry if there was a race. If I'd known about that bit of code =20\n" - "beforehand, I probably wouldn't have bothered with most of patch 4/4, =20\n" + "And before patch 4, we have the code near the end of \n" + "kvmppc_prepare_to_enter() that checks lazy_irq_pending() and aborts \n" + "guest entry if there was a race. If I'd known about that bit of code \n" + "beforehand, I probably wouldn't have bothered with most of patch 4/4, \n" "but now that it's been done it seems cleaner.\n" "\n" - -Scott= + -Scott -22d6aa3a32dbf16ff0695071f6aaf12bb1c4fc60171addc23316b68328b1ad6d +f863f1836e881bb00590cb66d5f67c07eb5aa16569889820094e8a0e208a4882
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.