armbian/linux
0
0
Fork 0
mirror of https://github.com/armbian/linux.git synced 2026-01-06 10:13:00 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v4.4.8' into linux-linaro-lsk-v4.4

Browse Source 
This is the 4.4.8 stable release
This commit is contained in:
Alex Shi
2016-04-21 12:06:25 +08:00
parent ad592b70ae 8c9aef03d3
commit 2bf7955152
153 changed files with 1339 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/bpf/helpers.c
View File

@@ -166,7 +166,7 @@ static u64 bpf_get_current_comm(u64 r1, u64 size, u64 r3, u64 r4, u64 r5)
if (!task)
return -EINVAL;
memcpy(buf, task->comm, min_t(size_t, size, sizeof(task->comm)));
strlcpy(buf, task->comm, min_t(size_t, size, sizeof(task->comm)));
return 0;
}

13
kernel/events/core.c
View File

@@ -1580,14 +1580,14 @@ event_sched_out(struct perf_event *event,
perf_pmu_disable(event->pmu);
event->tstamp_stopped = tstamp;
event->pmu->del(event, 0);
event->oncpu = -1;
event->state = PERF_EVENT_STATE_INACTIVE;
if (event->pending_disable) {
event->pending_disable = 0;
event->state = PERF_EVENT_STATE_OFF;
}
event->tstamp_stopped = tstamp;
event->pmu->del(event, 0);
event->oncpu = -1;
if (!is_software_event(event))
cpuctx->active_oncpu--;
@@ -8583,7 +8583,12 @@ err_context:
perf_unpin_context(ctx);
put_ctx(ctx);
err_alloc:
free_event(event);
/*
* If event_file is set, the fput() above will have called ->release()
* and that will take care of freeing the event.
*/
if (!event_file)
free_event(event);
err_cpus:
put_online_cpus();
err_task: