shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 05:17:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v4.9.274' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y

Browse Source 
Linux 4.9.274
This commit is contained in:
Mauro (mdrjr) Ribeiro
2021-07-30 21:02:29 -03:00
parent 5bdadab9f1 ebeed1e38d
commit d7dabe31af
68 changed files with 447 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/trace/trace.c
View File

@@ -1618,9 +1618,6 @@ struct saved_cmdlines_buffer {
};
static struct saved_cmdlines_buffer *savedcmd;
/* temporary disable recording */
static atomic_t trace_record_cmdline_disabled __read_mostly;
static inline char *get_saved_cmdlines(int idx)
{
return &savedcmd->saved_cmdlines[idx * TASK_COMM_LEN];
@@ -1903,9 +1900,6 @@ int trace_find_tgid(int pid)
void tracing_record_cmdline(struct task_struct *tsk)
{
if (atomic_read(&trace_record_cmdline_disabled) || !tracing_is_on())
return;
if (!__this_cpu_read(trace_cmdline_save))
return;
@@ -2849,9 +2843,6 @@ static void *s_start(struct seq_file *m, loff_t *pos)
return ERR_PTR(-EBUSY);
#endif
if (!iter->snapshot)
atomic_inc(&trace_record_cmdline_disabled);
if (*pos != iter->pos) {
iter->ent = NULL;
iter->cpu = 0;
@@ -2894,9 +2885,6 @@ static void s_stop(struct seq_file *m, void *p)
return;
#endif
if (!iter->snapshot)
atomic_dec(&trace_record_cmdline_disabled);
trace_access_unlock(iter->cpu_file);
trace_event_read_unlock();
}

6
kernel/trace/trace_clock.c
View File

@@ -113,9 +113,9 @@ u64 notrace trace_clock_global(void)
prev_time = READ_ONCE(trace_clock_struct.prev_time);
now = sched_clock_cpu(this_cpu);
/* Make sure that now is always greater than prev_time */
/* Make sure that now is always greater than or equal to prev_time */
if ((s64)(now - prev_time) < 0)
now = prev_time + 1;
now = prev_time;
/*
* If in an NMI context then dont risk lockups and simply return
@@ -129,7 +129,7 @@ u64 notrace trace_clock_global(void)
/* Reread prev_time in case it was already updated */
prev_time = READ_ONCE(trace_clock_struct.prev_time);
if ((s64)(now - prev_time) < 0)
now = prev_time + 1;
now = prev_time;
trace_clock_struct.prev_time = now;