diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-11-04 09:12:33 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-11-04 09:12:33 -0800 |
commit | 38f4c09779a2d66df53abed78a77539d765aff59 (patch) | |
tree | 8695117a037b42bfb897d1c470b52c88c6910a39 /tools | |
parent | 974070b95b0c8ff6ef0d62109c16aea160cf3c7c (diff) | |
parent | d17332ebfb5f2010ae5d3332a52df361f28ae4a8 (diff) |
Merge tag 'v3.10.92' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.10
This is the 3.10.92 stable release
# gpg: Signature made Mon Oct 26 17:45:12 2015 PDT using RSA key ID 6092693E
# gpg: Good signature from "Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com>"
* tag 'v3.10.92' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (73 commits)
Linux 3.10.92
rbd: fix double free on rbd_dev->header_name
dm thin: fix missing pool reference count decrement in pool_ctr error path
workqueue: make sure delayed work run in local cpu
i2c: rcar: enable RuntimePM before registering to the core
crypto: ahash - ensure statesize is non-zero
crypto: sparc - initialize blkcipher.ivsize
m68k/uaccess: Fix asm constraints for userspace access
asix: Do full reset during ax88772_bind
asix: Don't reset PHY on if_up for ASIX 88772
ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings
ppp: don't override sk->sk_state in pppoe_flush_dev()
net: add pfmemalloc check in sk_add_backlog()
skbuff: Fix skb checksum partial check.
skbuff: Fix skb checksum flag on skb pull
af_unix: return data from multiple SKBs on recv() with MSG_PEEK flag
af_unix: Convert the unix_sk macro to an inline function for type safety
l2tp: protect tunnel->del_work by ref_count
Linux 3.10.91
3w-9xxx: don't unmap bounce buffered commands
...
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/util/header.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 326068a593a5..bb34199d5451 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -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; } |