mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge remote-tracking branch 'tip/perf/urgent' into perf/core
To pick up fixes. Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
This commit is contained in:
commit
ce6c9da111
448 changed files with 4041 additions and 2428 deletions
|
|
@ -36,7 +36,7 @@ static const char *tracing_path_tracefs_mount(void)
|
|||
|
||||
__tracing_path_set("", mnt);
|
||||
|
||||
return mnt;
|
||||
return tracing_path;
|
||||
}
|
||||
|
||||
static const char *tracing_path_debugfs_mount(void)
|
||||
|
|
@ -49,7 +49,7 @@ static const char *tracing_path_debugfs_mount(void)
|
|||
|
||||
__tracing_path_set("tracing/", mnt);
|
||||
|
||||
return mnt;
|
||||
return tracing_path;
|
||||
}
|
||||
|
||||
const char *tracing_path_mount(void)
|
||||
|
|
|
|||
Loading…
Reference in a new issue