diff for duplicates of <5564917D.1000300@oracle.com> diff --git a/a/1.txt b/N1/1.txt index 550bbb0..6436b6e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,7 +46,7 @@ On 05/24/2015 02:00 PM, David Miller wrote: >> >> sun4v_patch_2insn_range(&__sun4v_2insn_patch, >> &__sun4v_2insn_patch_end); ->> + if (sun4v_chip_type = SUN4V_CHIP_SPARC_M7) +>> + if (sun4v_chip_type == SUN4V_CHIP_SPARC_M7) >> + sun_m7_patch_2insn_range(&__sun_m7_2insn_patch, >> + &__sun_m7_2insn_patch_end); > @@ -60,7 +60,7 @@ On 05/24/2015 02:00 PM, David Miller wrote: > >> @@ -2312,8 +2345,7 @@ int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend, >> _PAGE_P_4U | _PAGE_W_4U); ->> if (tlb_type = hypervisor) +>> if (tlb_type == hypervisor) >> pte_base = (_PAGE_VALID | _PAGE_SZ4MB_4V | >> - _PAGE_CP_4V | _PAGE_CV_4V | >> - _PAGE_P_4V | _PAGE_W_4V); diff --git a/a/content_digest b/N1/content_digest index f47831a..caefb72 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020150524.160000.1861676452576814254.davem@davemloft.net\0" "From\0Khalid Aziz <khalid.aziz@oracle.com>\0" "Subject\0Re: [PATCH v2] sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE\0" - "Date\0Tue, 26 May 2015 15:30:05 +0000\0" + "Date\0Tue, 26 May 2015 09:30:05 -0600\0" "To\0David Miller <davem@davemloft.net>\0" "Cc\0bob.picco@oracle.com" kirill.shutemov@linux.intel.com @@ -63,7 +63,7 @@ ">>\n" ">> \tsun4v_patch_2insn_range(&__sun4v_2insn_patch,\n" ">> \t\t\t\t&__sun4v_2insn_patch_end);\n" - ">> +\tif (sun4v_chip_type = SUN4V_CHIP_SPARC_M7)\n" + ">> +\tif (sun4v_chip_type == SUN4V_CHIP_SPARC_M7)\n" ">> +\t\tsun_m7_patch_2insn_range(&__sun_m7_2insn_patch,\n" ">> +\t\t\t\t&__sun_m7_2insn_patch_end);\n" ">\n" @@ -77,7 +77,7 @@ ">\n" ">> @@ -2312,8 +2345,7 @@ int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend,\n" ">> \t\t _PAGE_P_4U | _PAGE_W_4U);\n" - ">> \tif (tlb_type = hypervisor)\n" + ">> \tif (tlb_type == hypervisor)\n" ">> \t\tpte_base = (_PAGE_VALID | _PAGE_SZ4MB_4V |\n" ">> -\t\t\t _PAGE_CP_4V | _PAGE_CV_4V |\n" ">> -\t\t\t _PAGE_P_4V | _PAGE_W_4V);\n" @@ -105,4 +105,4 @@ "Thanks,\n" Khalid -9ea9853b28511ac7b4383a5524d2d95761e550a7a1efd2aedaa99cb6450ddb3c +0e051188459fdb106dfb88a78e1ac432806541427ac41e13ee8548c4f95910cc
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.