- Fix to show proper convergence stats in 'perf bench numa' (Srikar Dronamraju)
 
 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVjC0VAAoJENZQFvNTUqpANMwP/1adfsoDFqXFAmQaml4nm4U5
 arNqnE2+c/i5V1uyQ0xsW3+laV849jYnABEralOlq2NAQHTIWToFSVZes42cFXO/
 FTGzbSgW+NSIF2G/6TO6xm1JFSedf+jtWQUnRgto1UYQ+BpfjkTlC6vj0b7cpj4A
 0EbhV6RxC+o1rKrbyE/44kz8VgjMLfowkjh2ptfLLPW/vdaydkRwNJV3r4xWwps/
 7NwkEjsrqeKpHNZELf3XRJFxFn9vAg/iH02o320DsQl0fHCRsioZS4e9RxF70niV
 cTYtl9YNCrkYL9bbBYf/iqXrYorR2r5S2A5IOl6jCyfA5z4JrtcXTYkutvCemPSb
 0f3havNP9v2j5SK3HmJ4K3L2WNNH5ptwHlyc8GHudxT52CIOMDitjzOAe9SvzWOc
 KazICgucfKxeN9INpyDt51VccoYtPjHeQK7IP/qZ4KfA3acCrygDEf1e9uZPwqmM
 dWD024QtKKxPfsXv+GHZpYL1n02IUgDVdW55r2FckFije/p6aGW9YxYsMxb4mAn0
 BhiOLy8C3X29D6hLIWf1CP4/Rcum+v9Nzfg096h1Sgl7Q+2BWMd8uA1SVl6cPM8i
 V4FKX1TIty/Sp2w5HJXPXu3dv3YE28oaIXZXGPuQIlXDd82bPRCEh5T0FRyMZiHj
 eiTAX7vcBiubfGw9tG5l
 =jtHK
 -----END PGP SIGNATURE-----

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:

  - Fix to show proper convergence stats in 'perf bench numa' (Srikar Dronamraju)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2015-06-26 10:37:15 +02:00
Родитель 27451700df 2b42b09b88
Коммит df0d0da426
1 изменённых файлов: 4 добавлений и 0 удалений

Просмотреть файл

@ -7,11 +7,15 @@
static unsigned long flag = PERF_FLAG_FD_CLOEXEC;
#ifdef __GLIBC_PREREQ
#if !__GLIBC_PREREQ(2, 6)
int __weak sched_getcpu(void)
{
errno = ENOSYS;
return -1;
}
#endif
#endif
static int perf_flag_probe(void)
{