diff for duplicates of <87tx93q948.fsf@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 91a1c3e..8440500 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,9 +15,9 @@ Alexander Graf <agraf@suse.de> writes: >> /* only handle 4k, 64k and 16M pages for now */ >> if (!(h & HPTE_V_LARGE)) >> - return 1ul << 12; /* 4k page */ ->> - if ((l & 0xf000) = 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206)) +>> - if ((l & 0xf000) == 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206)) >> - return 1ul << 16; /* 64k page */ ->> - if ((l & 0xff000) = 0) +>> - if ((l & 0xff000) == 0) >> - return 1ul << 24; /* 16M page */ >> - return 0; /* error */ >> + return 1ul << 12; diff --git a/a/content_digest b/N1/content_digest index 2834c2b..5116703 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,10 +2,9 @@ "ref\05368A78D.4070509@suse.de\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" "Subject\0Re: [RFC PATCH] KVM: PPC: BOOK3S: HV: THP support for guest\0" - "Date\0Tue, 06 May 2014 14:35:19 +0000\0" + "Date\0Tue, 06 May 2014 19:53:19 +0530\0" "To\0Alexander Graf <agraf@suse.de>\0" - "Cc\0benh@kernel.crashing.org" - paulus@samba.org + "Cc\0paulus@samba.org" linuxppc-dev@lists.ozlabs.org kvm-ppc@vger.kernel.org " kvm@vger.kernel.org\0" @@ -28,9 +27,9 @@ ">> \t/* only handle 4k, 64k and 16M pages for now */\n" ">> \tif (!(h & HPTE_V_LARGE))\n" ">> -\t\treturn 1ul << 12;\t\t/* 4k page */\n" - ">> -\tif ((l & 0xf000) = 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206))\n" + ">> -\tif ((l & 0xf000) == 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206))\n" ">> -\t\treturn 1ul << 16;\t\t/* 64k page */\n" - ">> -\tif ((l & 0xff000) = 0)\n" + ">> -\tif ((l & 0xff000) == 0)\n" ">> -\t\treturn 1ul << 24;\t\t/* 16M page */\n" ">> -\treturn 0;\t\t\t\t/* error */\n" ">> +\t\treturn 1ul << 12;\n" @@ -96,4 +95,4 @@ "\n" -aneesh -ba4c37c7a5cc8b8b7c7fe25c57675f5540d3e97509761a70580376f32adee60e +7930312baa507f638f3da14097eed7667b76cdc84de192a132c912c7654ab03e
diff --git a/a/1.txt b/N2/1.txt index 91a1c3e..8440500 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,9 +15,9 @@ Alexander Graf <agraf@suse.de> writes: >> /* only handle 4k, 64k and 16M pages for now */ >> if (!(h & HPTE_V_LARGE)) >> - return 1ul << 12; /* 4k page */ ->> - if ((l & 0xf000) = 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206)) +>> - if ((l & 0xf000) == 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206)) >> - return 1ul << 16; /* 64k page */ ->> - if ((l & 0xff000) = 0) +>> - if ((l & 0xff000) == 0) >> - return 1ul << 24; /* 16M page */ >> - return 0; /* error */ >> + return 1ul << 12; diff --git a/a/content_digest b/N2/content_digest index 2834c2b..10dbcf4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\05368A78D.4070509@suse.de\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" "Subject\0Re: [RFC PATCH] KVM: PPC: BOOK3S: HV: THP support for guest\0" - "Date\0Tue, 06 May 2014 14:35:19 +0000\0" + "Date\0Tue, 06 May 2014 19:53:19 +0530\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0benh@kernel.crashing.org" paulus@samba.org @@ -28,9 +28,9 @@ ">> \t/* only handle 4k, 64k and 16M pages for now */\n" ">> \tif (!(h & HPTE_V_LARGE))\n" ">> -\t\treturn 1ul << 12;\t\t/* 4k page */\n" - ">> -\tif ((l & 0xf000) = 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206))\n" + ">> -\tif ((l & 0xf000) == 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206))\n" ">> -\t\treturn 1ul << 16;\t\t/* 64k page */\n" - ">> -\tif ((l & 0xff000) = 0)\n" + ">> -\tif ((l & 0xff000) == 0)\n" ">> -\t\treturn 1ul << 24;\t\t/* 16M page */\n" ">> -\treturn 0;\t\t\t\t/* error */\n" ">> +\t\treturn 1ul << 12;\n" @@ -96,4 +96,4 @@ "\n" -aneesh -ba4c37c7a5cc8b8b7c7fe25c57675f5540d3e97509761a70580376f32adee60e +9371719a1ef663f4455bb24dbf0abb5935201a06949b989d79af90ffd0d94c4a
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.