projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 's390-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[linux-2.6-microblaze.git]
/
arch
/
s390
/
kernel
/
perf_cpum_cf.c
diff --git
a/arch/s390/kernel/perf_cpum_cf.c
b/arch/s390/kernel/perf_cpum_cf.c
index
d7dc36e
..
4a99154
100644
(file)
--- a/
arch/s390/kernel/perf_cpum_cf.c
+++ b/
arch/s390/kernel/perf_cpum_cf.c
@@
-158,6
+158,14
@@
static size_t cfdiag_getctrset(struct cf_ctrset_entry *ctrdata, int ctrset,
return need;
}
return need;
}
+static const u64 cpumf_ctr_ctl[CPUMF_CTR_SET_MAX] = {
+ [CPUMF_CTR_SET_BASIC] = 0x02,
+ [CPUMF_CTR_SET_USER] = 0x04,
+ [CPUMF_CTR_SET_CRYPTO] = 0x08,
+ [CPUMF_CTR_SET_EXT] = 0x01,
+ [CPUMF_CTR_SET_MT_DIAG] = 0x20,
+};
+
/* Read out all counter sets and save them in the provided data buffer.
* The last 64 byte host an artificial trailer entry.
*/
/* Read out all counter sets and save them in the provided data buffer.
* The last 64 byte host an artificial trailer entry.
*/
@@
-1138,7
+1146,7
@@
static long cfset_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
int ret;
{
int ret;
-
get_online_cpus
();
+
cpus_read_lock
();
mutex_lock(&cfset_ctrset_mutex);
switch (cmd) {
case S390_HWCTR_START:
mutex_lock(&cfset_ctrset_mutex);
switch (cmd) {
case S390_HWCTR_START:
@@
-1155,7
+1163,7
@@
static long cfset_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
break;
}
mutex_unlock(&cfset_ctrset_mutex);
break;
}
mutex_unlock(&cfset_ctrset_mutex);
-
put_online_cpus
();
+
cpus_read_unlock
();
return ret;
}
return ret;
}