From: Peter Zijlstra <peterz@infradead.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@elte.hu>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH] perf_counter: fix ioctl()s
Date: Tue, 12 May 2009 12:59:33 +0200 [thread overview]
Message-ID: <1242125974.11251.329.camel@twins> (raw)
In-Reply-To: <200905120952.12847.arnd@arndb.de>
On Tue, 2009-05-12 at 09:52 +0200, Arnd Bergmann wrote:
> On Tuesday 12 May 2009, Peter Zijlstra wrote:
> > Ah, so _IO() gets an unsigned long 3rd argument.
> > _IOW() treats the 3rd arg as a (type __user *) and copies the bits over
> > _IOR() copies the bits back out to userspace
> > _IORW() does both
> >
> > In which case the below should fix things up, no?
> >
>
> Yes, this looks good now.
---
Arnd spotted that I misunderstood and wrongly used the 3rd ioctl
argument. Fix up the perf counter ioctl()s to use the 3rd argument as
value -- as opposed to a pointer as would now be the case.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
include/linux/perf_counter.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index 614f921..6a9cebc 100644
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -159,10 +159,10 @@ struct perf_counter_hw_event {
/*
* Ioctls that can be done on a perf counter fd:
*/
-#define PERF_COUNTER_IOC_ENABLE _IOW('$', 0, u32)
-#define PERF_COUNTER_IOC_DISABLE _IOW('$', 1, u32)
-#define PERF_COUNTER_IOC_REFRESH _IOW('$', 2, u32)
-#define PERF_COUNTER_IOC_RESET _IOW('$', 3, u32)
+#define PERF_COUNTER_IOC_ENABLE _IO('$', 0)
+#define PERF_COUNTER_IOC_DISABLE _IO('$', 1)
+#define PERF_COUNTER_IOC_REFRESH _IO('$', 2)
+#define PERF_COUNTER_IOC_RESET _IO('$', 3)
enum perf_counter_ioc_flags {
PERF_IOC_FLAG_GROUP = 1U << 0,
next prev parent reply other threads:[~2009-05-12 10:59 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-08 16:52 [PATCH 0/5] pending patches Peter Zijlstra
2009-05-08 16:52 ` [PATCH 1/5] hrtimer: per-cpu cached values of ktime Peter Zijlstra
2009-05-08 23:10 ` Andrew Morton
2009-05-09 19:45 ` Linus Torvalds
2009-05-09 19:59 ` Peter Zijlstra
2009-05-08 16:52 ` [PATCH 2/5] perf_counter: optimize perf_counter_task_tick() Peter Zijlstra
2009-05-08 18:39 ` [tip:perfcounters/core] " tip-bot for Peter Zijlstra
2009-05-08 16:52 ` [PATCH 3/5] perf_counter: rework ioctl()s Peter Zijlstra
2009-05-08 18:39 ` [tip:perfcounters/core] " tip-bot for Peter Zijlstra
2009-05-11 1:29 ` [PATCH 3/5] " Paul Mackerras
2009-05-11 15:12 ` Peter Zijlstra
2009-05-12 6:24 ` Paul Mackerras
2009-05-11 18:12 ` Corey Ashford
2009-05-11 20:52 ` Paul Mackerras
2009-05-11 22:37 ` Corey Ashford
2009-05-12 6:16 ` Paul Mackerras
2009-05-12 16:15 ` Corey Ashford
2009-05-12 22:18 ` Paul Mackerras
2009-05-12 22:51 ` Corey Ashford
2009-05-11 23:58 ` Arnd Bergmann
2009-05-12 6:11 ` Peter Zijlstra
2009-05-12 6:22 ` Paul Mackerras
2009-05-12 6:27 ` Peter Zijlstra
2009-05-12 7:10 ` Peter Zijlstra
2009-05-12 7:52 ` Arnd Bergmann
2009-05-12 10:59 ` Peter Zijlstra [this message]
2009-05-12 11:21 ` Paul Mackerras
2009-05-08 16:52 ` [PATCH 4/5] perf_counter: PERF_RECORD_CONFIG Peter Zijlstra
2009-05-08 18:39 ` [tip:perfcounters/core] perf_counter: add PERF_RECORD_CONFIG tip-bot for Peter Zijlstra
2009-05-08 16:52 ` [PATCH 5/5] perf_counter: PERF_RECORD_CPU Peter Zijlstra
2009-05-08 18:40 ` [tip:perfcounters/core] perf_counter: add PERF_RECORD_CPU tip-bot for Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1242125974.11251.329.camel@twins \
--to=peterz@infradead.org \
--cc=arnd@arndb.de \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox