diff options
| -rw-r--r-- | arch/s390/kernel/perf_pai_crypto.c | 11 | ||||
| -rw-r--r-- | arch/s390/kernel/perf_pai_ext.c | 1 | 
2 files changed, 5 insertions, 7 deletions
| diff --git a/arch/s390/kernel/perf_pai_crypto.c b/arch/s390/kernel/perf_pai_crypto.c index 77fd24e6cbb6..39a91b00438a 100644 --- a/arch/s390/kernel/perf_pai_crypto.c +++ b/arch/s390/kernel/perf_pai_crypto.c @@ -279,12 +279,6 @@ static int paicrypt_event_init(struct perf_event *event)  	if (IS_ERR(cpump))  		return PTR_ERR(cpump); -	/* Event initialization sets last_tag to 0. When later on the events -	 * are deleted and re-added, do not reset the event count value to zero. -	 * Events are added, deleted and re-added when 2 or more events -	 * are active at the same time. -	 */ -	event->hw.last_tag = 0;  	event->destroy = paicrypt_event_destroy;  	if (a->sample_period) { @@ -318,6 +312,11 @@ static void paicrypt_start(struct perf_event *event, int flags)  {  	u64 sum; +	/* Event initialization sets last_tag to 0. When later on the events +	 * are deleted and re-added, do not reset the event count value to zero. +	 * Events are added, deleted and re-added when 2 or more events +	 * are active at the same time. +	 */  	if (!event->hw.last_tag) {  		event->hw.last_tag = 1;  		sum = paicrypt_getall(event);		/* Get current value */ diff --git a/arch/s390/kernel/perf_pai_ext.c b/arch/s390/kernel/perf_pai_ext.c index 8ba0f1a3a39d..e7013a2e8960 100644 --- a/arch/s390/kernel/perf_pai_ext.c +++ b/arch/s390/kernel/perf_pai_ext.c @@ -260,7 +260,6 @@ static int paiext_event_init(struct perf_event *event)  	rc = paiext_alloc(a, event);  	if (rc)  		return rc; -	event->hw.last_tag = 0;  	event->destroy = paiext_event_destroy;  	if (a->sample_period) { | 
