Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
commit91a4dc9f71e4b8f9b8da547d19f80e7be89d7539
authorIngo Molnar <mingo@kernel.org>
Mon, 14 Sep 2015 07:29:22 +0000 (14 09:29 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 14 Sep 2015 07:29:22 +0000 (14 09:29 +0200)
tree8f891ca6c9f76106a05d754d638dbd65c1d44dca
parentebfb4988f0378e2ac3b4a0aa1ea20d724293f392
parentcaa470475d9b59eeff093ae650800d34612c4379
Merge tag 'perf-urgent-for-mingo' of git://git./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>