[PATCH v3 6/7] ARM: KVM: switch to a dual-step HYP init code

[Russell King - ARM Linux]

On Fri, Apr 12, 2013 at 04:18:51PM +0100, Marc Zyngier wrote:
> @@ -247,7 +265,11 @@ static int __create_hyp_mappings(pgd_t *pgdp,
>  				goto out;
>  			}
>  			pud_populate(NULL, pud, pmd);
> +<<<<<<< HEAD
>  			get_page(virt_to_page(pud));
> +=======
> +			kvm_flush_dcache_to_poc(pud, sizeof(*pud));
> +>>>>>>> 180de35... ARM: KVM: switch to a dual-step HYP init code

I don't think you want this in your patch... and as no one else spotted
this, has anyone looked at this patch set yet?