]> git.karo-electronics.de Git - karo-tx-linux.git/commit
fix mis-applied upstream commit ac9721f3f54b27a16c7e1afb2481e7ee95a70318
authorJan Beulich <JBeulich@novell.com>
Tue, 6 Jul 2010 10:09:00 +0000 (11:09 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 2 Aug 2010 17:29:20 +0000 (10:29 -0700)
commit0c7066ca14c6ac8986510ba5bd946b0b50373d84
tree060674387285a9a73bc4589bdd4fbd6ffc39f76e
parentcbed49406bb192d2d87a8a88c757f0bfaddb59de
fix mis-applied upstream commit ac9721f3f54b27a16c7e1afb2481e7ee95a70318

For some reason one of the changes to sys_perf_event_open() got
mis-applied, thus breaking (at least) error handling paths (pointed
out by means of a compiler warning).

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
kernel/perf_event.c