diff for duplicates of <56AB666D.6090200@linaro.org> diff --git a/a/1.txt b/N1/1.txt index 41e78d9..6055fb9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,10 +43,10 @@ On 2016/1/29 19:08, Andrew Jones wrote: >>>>> > >> >+ * PMUSERENR: user enable reg >>>>> > >> >+ */ >>>>> > >> >+#define ARMV8_USERENR_MASK 0xf /* Mask for writable bits */ ->>>>> > >> >+#define ARMV8_USERENR_EN (1 << 0) /* PMU regs can be accessed at EL0 */ ->>>>> > >> >+#define ARMV8_USERENR_SW (1 << 1) /* PMSWINC can be written at EL0 */ ->>>>> > >> >+#define ARMV8_USERENR_CR (1 << 2) /* Cycle counter can be read at EL0 */ ->>>>> > >> >+#define ARMV8_USERENR_ER (1 << 3) /* Event counter can be read at EL0 */ +>>>>> > >> >+#define ARMV8_USERENR_EN (1 << 0) /* PMU regs can be accessed@EL0 */ +>>>>> > >> >+#define ARMV8_USERENR_SW (1 << 1) /* PMSWINC can be written@EL0 */ +>>>>> > >> >+#define ARMV8_USERENR_CR (1 << 2) /* Cycle counter can be read@EL0 */ +>>>>> > >> >+#define ARMV8_USERENR_ER (1 << 3) /* Event counter can be read@EL0 */ >>>>> > >> >+ >>>>> > >> > #endif /* __ASM_PMU_H */ >>>>> > >> >diff --git a/arch/arm64/kvm/hyp/hyp.h b/arch/arm64/kvm/hyp/hyp.h diff --git a/a/content_digest b/N1/content_digest index c2e379b..b60ddfb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,16 +3,10 @@ "ref\020160128195814.GF16453@hawk.localdomain\0" "ref\056AB16B6.8060208@huawei.com\0" "ref\020160129110840.GA4340@hawk.localdomain\0" - "From\0Shannon Zhao <shannon.zhao@linaro.org>\0" - "Subject\0Re: [PATCH v10 15/21] KVM: ARM64: Add access handler for PMUSERENR register\0" + "From\0shannon.zhao@linaro.org (Shannon Zhao)\0" + "Subject\0[PATCH v10 15/21] KVM: ARM64: Add access handler for PMUSERENR register\0" "Date\0Fri, 29 Jan 2016 21:17:33 +0800\0" - "To\0Andrew Jones <drjones@redhat.com>" - " Shannon Zhao <zhaoshenglong@huawei.com>\0" - "Cc\0kvm@vger.kernel.org" - marc.zyngier@arm.com - will.deacon@arm.com - linux-arm-kernel@lists.infradead.org - " kvmarm@lists.cs.columbia.edu\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\n" @@ -60,10 +54,10 @@ ">>>>> > >> >+ * PMUSERENR: user enable reg\n" ">>>>> > >> >+ */\n" ">>>>> > >> >+#define ARMV8_USERENR_MASK\t0xf\t\t/* Mask for writable bits */\n" - ">>>>> > >> >+#define ARMV8_USERENR_EN\t(1 << 0) /* PMU regs can be accessed at EL0 */\n" - ">>>>> > >> >+#define ARMV8_USERENR_SW\t(1 << 1) /* PMSWINC can be written at EL0 */\n" - ">>>>> > >> >+#define ARMV8_USERENR_CR\t(1 << 2) /* Cycle counter can be read at EL0 */\n" - ">>>>> > >> >+#define ARMV8_USERENR_ER\t(1 << 3) /* Event counter can be read at EL0 */\n" + ">>>>> > >> >+#define ARMV8_USERENR_EN\t(1 << 0) /* PMU regs can be accessed@EL0 */\n" + ">>>>> > >> >+#define ARMV8_USERENR_SW\t(1 << 1) /* PMSWINC can be written@EL0 */\n" + ">>>>> > >> >+#define ARMV8_USERENR_CR\t(1 << 2) /* Cycle counter can be read@EL0 */\n" + ">>>>> > >> >+#define ARMV8_USERENR_ER\t(1 << 3) /* Event counter can be read@EL0 */\n" ">>>>> > >> >+\n" ">>>>> > >> > #endif /* __ASM_PMU_H */\n" ">>>>> > >> >diff --git a/arch/arm64/kvm/hyp/hyp.h b/arch/arm64/kvm/hyp/hyp.h\n" @@ -185,4 +179,4 @@ "-- \n" Shannon -dfa1c866de3d2d9d3829757e88ceb8c28baaee8ba43c52da01edea4520a2735e +92a1f5bb11a15d2815944310e8164347a4afd08f4d01847ad45c87c7d8b4cc43
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.