Commit 91a4dc9f authored Sep 14, 2015 by Ingo Molnar

Merge tag 'perf-urgent-for-mingo' of...

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fix from Arnaldo Carvalho de Melo:

  - The values of _SC_NPROCESSORS_CONF and _SC_NPROCESSORS_ONLN (sysconf(3)) were
    being read from perf.data files in the inverse order they are written, fix it.
    (Arnaldo Carvalho de Melo)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents ebfb4988 caa47047

tools/perf/util/header.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1438,7 +1438,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))
		@@ -1447,7 +1447,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;
		}