diff for duplicates of <539ACC62.1040004@suse.de> diff --git a/a/1.txt b/N1/1.txt index fae94cf..33303c8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -84,9 +84,9 @@ Alex > @@ -839,7 +839,7 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v, > * to check against the actual page size. > */ -> if ((v & valid) && (v & mask) = val && -> - hpte_page_size(v, r) = (1ul << pshift)) -> + hpte_base_page_size(v, r) = (1ul << pshift)) +> if ((v & valid) && (v & mask) == val && +> - hpte_page_size(v, r) == (1ul << pshift)) +> + hpte_base_page_size(v, r) == (1ul << pshift)) > /* Return with the HPTE still locked */ > return (hash << 3) + (i >> 1); > diff --git a/a/content_digest b/N1/content_digest index 08a325f..3b32e2b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,13 @@ "ref\01402644190-15604-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH] KVM: PPC: BOOK3S: HV: Use base page size when comparing against slb value\0" - "Date\0Fri, 13 Jun 2014 10:03:14 +0000\0" + "Date\0Fri, 13 Jun 2014 12:03:14 +0200\0" "To\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>" benh@kernel.crashing.org " paulus@samba.org\0" "Cc\0linuxppc-dev@lists.ozlabs.org" - kvm-ppc@vger.kernel.org - " kvm@vger.kernel.org\0" + kvm@vger.kernel.org + " kvm-ppc@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -96,11 +96,11 @@ "> @@ -839,7 +839,7 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v,\n" "> \t\t\t * to check against the actual page size.\n" "> \t\t\t */\n" - "> \t\t\tif ((v & valid) && (v & mask) = val &&\n" - "> -\t\t\t hpte_page_size(v, r) = (1ul << pshift))\n" - "> +\t\t\t hpte_base_page_size(v, r) = (1ul << pshift))\n" + "> \t\t\tif ((v & valid) && (v & mask) == val &&\n" + "> -\t\t\t hpte_page_size(v, r) == (1ul << pshift))\n" + "> +\t\t\t hpte_base_page_size(v, r) == (1ul << pshift))\n" "> \t\t\t\t/* Return with the HPTE still locked */\n" "> \t\t\t\treturn (hash << 3) + (i >> 1);\n" > -951ee3e37ec7ad5972947c621faa376b1d6e37082554bf2d186a7190a7e2d58b +db9a2a18d6d678a4b05b54be5bee0b2565b5e7654ee32447b599259922bc4a07
diff --git a/a/1.txt b/N2/1.txt index fae94cf..33303c8 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -84,9 +84,9 @@ Alex > @@ -839,7 +839,7 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v, > * to check against the actual page size. > */ -> if ((v & valid) && (v & mask) = val && -> - hpte_page_size(v, r) = (1ul << pshift)) -> + hpte_base_page_size(v, r) = (1ul << pshift)) +> if ((v & valid) && (v & mask) == val && +> - hpte_page_size(v, r) == (1ul << pshift)) +> + hpte_base_page_size(v, r) == (1ul << pshift)) > /* Return with the HPTE still locked */ > return (hash << 3) + (i >> 1); > diff --git a/a/content_digest b/N2/content_digest index 08a325f..ef0cd2c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01402644190-15604-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH] KVM: PPC: BOOK3S: HV: Use base page size when comparing against slb value\0" - "Date\0Fri, 13 Jun 2014 10:03:14 +0000\0" + "Date\0Fri, 13 Jun 2014 12:03:14 +0200\0" "To\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>" benh@kernel.crashing.org " paulus@samba.org\0" @@ -96,11 +96,11 @@ "> @@ -839,7 +839,7 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v,\n" "> \t\t\t * to check against the actual page size.\n" "> \t\t\t */\n" - "> \t\t\tif ((v & valid) && (v & mask) = val &&\n" - "> -\t\t\t hpte_page_size(v, r) = (1ul << pshift))\n" - "> +\t\t\t hpte_base_page_size(v, r) = (1ul << pshift))\n" + "> \t\t\tif ((v & valid) && (v & mask) == val &&\n" + "> -\t\t\t hpte_page_size(v, r) == (1ul << pshift))\n" + "> +\t\t\t hpte_base_page_size(v, r) == (1ul << pshift))\n" "> \t\t\t\t/* Return with the HPTE still locked */\n" "> \t\t\t\treturn (hash << 3) + (i >> 1);\n" > -951ee3e37ec7ad5972947c621faa376b1d6e37082554bf2d186a7190a7e2d58b +1f87307087bca69d4eb2cba0ef48db6488fce38821ac2ebb469b82389e9f499d
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.