* [PATCH] perf: Fix invalid type in ioctl definition
@ 2009-11-14 5:47 Arjan van de Ven
2009-11-14 9:27 ` [tip:perf/core] perf_event: " tip-bot for Arjan van de Ven
0 siblings, 1 reply; 2+ messages in thread
From: Arjan van de Ven @ 2009-11-14 5:47 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel
>From 39ad70666fd2e6fdb9a5b83845c2244b4a111219 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Fri, 13 Nov 2009 21:36:06 -0800
Subject: [PATCH] perf: Fix invalid type in ioctl definition
u64 is invalid in userspace headers, including ioctl definitions;
use __u64 instead
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
---
include/linux/perf_event.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 9e70126..81c9689 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -219,7 +219,7 @@ struct perf_event_attr {
#define PERF_EVENT_IOC_DISABLE _IO ('$', 1)
#define PERF_EVENT_IOC_REFRESH _IO ('$', 2)
#define PERF_EVENT_IOC_RESET _IO ('$', 3)
-#define PERF_EVENT_IOC_PERIOD _IOW('$', 4, u64)
+#define PERF_EVENT_IOC_PERIOD _IOW('$', 4, __u64)
#define PERF_EVENT_IOC_SET_OUTPUT _IO ('$', 5)
enum perf_event_ioc_flags {
--
1.6.0.6
--
Arjan van de Ven Intel Open Source Technology Centre
For development, discussion and tips for power savings,
visit http://www.lesswatts.org
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:perf/core] perf_event: Fix invalid type in ioctl definition
2009-11-14 5:47 [PATCH] perf: Fix invalid type in ioctl definition Arjan van de Ven
@ 2009-11-14 9:27 ` tip-bot for Arjan van de Ven
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Arjan van de Ven @ 2009-11-14 9:27 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, arjan, hpa, mingo, arjan, stable, tglx, mingo
Commit-ID: 4c49b12853fbb5eff4849b7b6a1e895776f027a1
Gitweb: http://git.kernel.org/tip/4c49b12853fbb5eff4849b7b6a1e895776f027a1
Author: Arjan van de Ven <arjan@infradead.org>
AuthorDate: Fri, 13 Nov 2009 21:47:33 -0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Sat, 14 Nov 2009 10:23:52 +0100
perf_event: Fix invalid type in ioctl definition
u64 is invalid in userspace headers, including ioctl
definitions; use __u64 instead
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: <stable@kernel.org>
LKML-Reference: <20091113214733.7cd76be9@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
include/linux/perf_event.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 45b56fa..ec3768a 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -219,7 +219,7 @@ struct perf_event_attr {
#define PERF_EVENT_IOC_DISABLE _IO ('$', 1)
#define PERF_EVENT_IOC_REFRESH _IO ('$', 2)
#define PERF_EVENT_IOC_RESET _IO ('$', 3)
-#define PERF_EVENT_IOC_PERIOD _IOW('$', 4, u64)
+#define PERF_EVENT_IOC_PERIOD _IOW('$', 4, __u64)
#define PERF_EVENT_IOC_SET_OUTPUT _IO ('$', 5)
#define PERF_EVENT_IOC_SET_FILTER _IOW('$', 6, char *)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-11-14 9:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-14 5:47 [PATCH] perf: Fix invalid type in ioctl definition Arjan van de Ven
2009-11-14 9:27 ` [tip:perf/core] perf_event: " tip-bot for Arjan van de Ven
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome