diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-14 04:35:03 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-14 04:35:03 +0100 |
| commit | 2da994e687f7991cc76e3270c423bf6500b9424a (patch) | |
| tree | 437d685035c2a39395f14c233831422ed636c016 /arch/mips | |
| parent | Merge branch 'highbank/devel' into next/devel (diff) | |
| parent | ARM: Orion: Remove address map info from all platform data structures (diff) | |
| download | linux-2da994e687f7991cc76e3270c423bf6500b9424a.tar.xz linux-2da994e687f7991cc76e3270c423bf6500b9424a.zip | |
Merge branch 'orion/devel' into next/devel
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/perf_event_mipsxx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c index 4f2971bcf8e5..315fc0b250f8 100644 --- a/arch/mips/kernel/perf_event_mipsxx.c +++ b/arch/mips/kernel/perf_event_mipsxx.c @@ -623,7 +623,7 @@ static int mipspmu_event_init(struct perf_event *event) if (!atomic_inc_not_zero(&active_events)) { if (atomic_read(&active_events) > MIPS_MAX_HWEVENTS) { atomic_dec(&active_events); - return -ENOSPC; + return -EINVAL; } mutex_lock(&pmu_reserve_mutex); @@ -732,15 +732,15 @@ static int validate_group(struct perf_event *event) memset(&fake_cpuc, 0, sizeof(fake_cpuc)); if (!validate_event(&fake_cpuc, leader)) - return -ENOSPC; + return -EINVAL; list_for_each_entry(sibling, &leader->sibling_list, group_entry) { if (!validate_event(&fake_cpuc, sibling)) - return -ENOSPC; + return -EINVAL; } if (!validate_event(&fake_cpuc, event)) - return -ENOSPC; + return -EINVAL; return 0; } |