Merge tag 'v3.10.91' into update

This is the 3.10.91 stable release
This commit is contained in:
Stricted
2018-03-21 22:48:36 +01:00
68 changed files with 538 additions and 145 deletions
+2 -2
View File
@@ -1729,7 +1729,7 @@ static int process_nrcpus(struct perf_file_section *section __maybe_unused,
if (ph->needs_swap)
nr = bswap_32(nr);
ph->env.nr_cpus_online = nr;
ph->env.nr_cpus_avail = nr;
ret = readn(fd, &nr, sizeof(nr));
if (ret != sizeof(nr))
@@ -1738,7 +1738,7 @@ static int process_nrcpus(struct perf_file_section *section __maybe_unused,
if (ph->needs_swap)
nr = bswap_32(nr);
ph->env.nr_cpus_avail = nr;
ph->env.nr_cpus_online = nr;
return 0;
}