diff options
| author | Chen Gang <gang.chen@asianux.com> | 2013-02-28 17:51:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-03-03 23:54:17 +0100 |
| commit | e595ede6050b1ce982d74f7084f93715bcc32359 (patch) | |
| tree | 418d4c421e94a3da4351a8a75855bfa4c5279526 /arch/arm/kernel | |
| parent | ARM: 7663/1: perf: fix ARMv7 EVTYPE_MASK to include NSH bit (diff) | |
| download | linux-e595ede6050b1ce982d74f7084f93715bcc32359.tar.xz linux-e595ede6050b1ce982d74f7084f93715bcc32359.zip | |
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')
| -rw-r--r-- | arch/arm/kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index 31e0eb353cd8..a89206799db8 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; } |