diff for duplicates of <20141028033425.866163449@linuxfoundation.org> diff --git a/a/1.txt b/N1/1.txt index 8dcbda6..aec27e0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -83,7 +83,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +ENDPROC(sun4v_t5_set_perfreg) --- a/arch/sparc/kernel/pcr.c +++ b/arch/sparc/kernel/pcr.c -@@ -191,12 +191,41 @@ static const struct pcr_ops n4_pcr_ops .pcr_nmi_disable = PCR_N4_PICNPT, +@@ -191,12 +191,41 @@ static const struct pcr_ops n4_pcr_ops = + .pcr_nmi_disable = PCR_N4_PICNPT, }; +static u64 n5_pcr_read(unsigned long reg_num) @@ -121,7 +122,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { + unsigned long hverror; + - if (tlb_type = hypervisor) { + if (tlb_type == hypervisor) { switch (sun4v_chip_type) { case SUN4V_CHIP_NIAGARA1: @@ -215,6 +244,10 @@ static int __init register_perf_hsvc(voi diff --git a/a/content_digest b/N1/content_digest index a29640e..dabc7bf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020141028033420.925922046@linuxfoundation.org\0" "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Subject\0[PATCH 3.16 115/127] sparc64: T5 PMU\0" - "Date\0Tue, 28 Oct 2014 03:35:50 +0000\0" + "Date\0Tue, 28 Oct 2014 11:35:50 +0800\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" stable@vger.kernel.org @@ -95,7 +95,8 @@ "+ENDPROC(sun4v_t5_set_perfreg)\n" "--- a/arch/sparc/kernel/pcr.c\n" "+++ b/arch/sparc/kernel/pcr.c\n" - "@@ -191,12 +191,41 @@ static const struct pcr_ops n4_pcr_ops \t.pcr_nmi_disable\t= PCR_N4_PICNPT,\n" + "@@ -191,12 +191,41 @@ static const struct pcr_ops n4_pcr_ops =\n" + " \t.pcr_nmi_disable\t= PCR_N4_PICNPT,\n" " };\n" " \n" "+static u64 n5_pcr_read(unsigned long reg_num)\n" @@ -133,7 +134,7 @@ " {\n" "+\tunsigned long hverror;\n" "+\n" - " \tif (tlb_type = hypervisor) {\n" + " \tif (tlb_type == hypervisor) {\n" " \t\tswitch (sun4v_chip_type) {\n" " \t\tcase SUN4V_CHIP_NIAGARA1:\n" "@@ -215,6 +244,10 @@ static int __init register_perf_hsvc(voi\n" @@ -188,4 +189,4 @@ " \t\treturn true;\n" " \t}" -4611c9ec8b65caf17b0d54e7265e6f920a3a73ff4f3a0dfc7f7e66624208c4cf +268bc741be7677d38a2b253146fd670ed1c2bed8b0e7110a8a9bc65cdccf3816
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.