aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/kernel/perf_event.c
diff options
context:
space:
mode:
authorChen Gang <gang.chen@asianux.com>2013-02-28 17:51:29 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-03-03 22:54:17 +0000
commite595ede6050b1ce982d74f7084f93715bcc32359 (patch)
tree418d4c421e94a3da4351a8a75855bfa4c5279526 /arch/arm/kernel/perf_event.c
parentf2fe09b055e2549de41fb107b34c60bac4a1b0cf (diff)
downloadvexpress-lsk-e595ede6050b1ce982d74f7084f93715bcc32359.tar.gz
ARM: 7664/1: perf: remove erroneous semicolon from event initialisation
Commit 9dcbf466559f ("ARM: perf: simplify __hw_perf_event_init err handling") tidied up the error handling code for perf event initialisation on ARM, but a copy-and-paste error left a dangling semicolon at the end of an if statement. This patch removes the broken semicolon, restoring the old group validation semantics. Cc: Mark Rutland <mark.rutland@arm.com> Acked-by: Dirk Behme <dirk.behme@gmail.com> Signed-off-by: Chen Gang <gang.chen@asianux.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/perf_event.c')
-rw-r--r--arch/arm/kernel/perf_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index 31e0eb353cd..a89206799db 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -400,7 +400,7 @@ __hw_perf_event_init(struct perf_event *event)
}
if (event->group_leader != event) {
- if (validate_group(event) != 0);
+ if (validate_group(event) != 0)
return -EINVAL;
}