AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-04 18:06:49 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf/core: Rename perf_event_read_{one,group}, perf_read_hw

Browse Source 
In order to free up the perf_event_read_group() name:

 s/perf_event_read_\(one\|group\)/perf_read_\1/g
 s/perf_read_hw/__perf_read/g

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1441336073-22750-5-git-send-email-sukadev@linux.vnet.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Peter Zijlstra (Intel) 2015-09-03 20:07:47 -07:00 committed by Ingo Molnar
parent 01add3eaf1
commit b15f495b4e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/events/core.c
View File

@ -3742,7 +3742,7 @@ static void put_event(struct perf_event *event)
* see the comment there. * see the comment there.
* *
* 2) there is a lock-inversion with mmap_sem through * 2) there is a lock-inversion with mmap_sem through
* perf_event_read_group(), which takes faults while * perf_read_group(), which takes faults while
* holding ctx->mutex, however this is called after * holding ctx->mutex, however this is called after
* the last filedesc died, so there is no possibility * the last filedesc died, so there is no possibility
* to trigger the AB-BA case. * to trigger the AB-BA case.
@ -3837,7 +3837,7 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
} }
EXPORT_SYMBOL_GPL(perf_event_read_value); EXPORT_SYMBOL_GPL(perf_event_read_value);
static int perf_event_read_group(struct perf_event *event, static int perf_read_group(struct perf_event *event,
u64 read_format, char __user *buf) u64 read_format, char __user *buf)
{ {
struct perf_event *leader = event->group_leader, *sub; struct perf_event *leader = event->group_leader, *sub;
@ -3885,7 +3885,7 @@ static int perf_event_read_group(struct perf_event *event,
return ret; return ret;
} }
static int perf_event_read_one(struct perf_event *event, static int perf_read_one(struct perf_event *event,
u64 read_format, char __user *buf) u64 read_format, char __user *buf)
{ {
u64 enabled, running; u64 enabled, running;
@ -3923,7 +3923,7 @@ static bool is_event_hup(struct perf_event *event)
* Read the performance event - simple non blocking version for now * Read the performance event - simple non blocking version for now
*/ */
static ssize_t static ssize_t
perf_read_hw(struct perf_event *event, char __user *buf, size_t count) __perf_read(struct perf_event *event, char __user *buf, size_t count)
{ {
u64 read_format = event->attr.read_format; u64 read_format = event->attr.read_format;
int ret; int ret;
@ -3941,9 +3941,9 @@ perf_read_hw(struct perf_event *event, char __user *buf, size_t count)
WARN_ON_ONCE(event->ctx->parent_ctx); WARN_ON_ONCE(event->ctx->parent_ctx);
if (read_format & PERF_FORMAT_GROUP) if (read_format & PERF_FORMAT_GROUP)
ret = perf_event_read_group(event, read_format, buf); ret = perf_read_group(event, read_format, buf);
else else
ret = perf_event_read_one(event, read_format, buf); ret = perf_read_one(event, read_format, buf);
return ret; return ret;
} }
@ -3956,7 +3956,7 @@ perf_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
int ret; int ret;
ctx = perf_event_ctx_lock(event); ctx = perf_event_ctx_lock(event);
ret = perf_read_hw(event, buf, count); ret = __perf_read(event, buf, count);
perf_event_ctx_unlock(event, ctx); perf_event_ctx_unlock(event, ctx);
return ret; return ret;