[tip:perf/urgent] perf: Move mmap page data_head offset assertion out of header

[tip-bot for Jiri Olsa]

Commit-ID:  b01c3a0010aabadf745f3e7fdb9cab682e0a28a2
Gitweb:     http://git.kernel.org/tip/b01c3a0010aabadf745f3e7fdb9cab682e0a28a2
Author:     Jiri Olsa <jolsa@xxxxxxxxxx>
AuthorDate: Fri, 23 Mar 2012 15:41:20 +0100
Committer:  Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Sat, 24 Mar 2012 08:46:59 +0100

perf: Move mmap page data_head offset assertion out of header

Having the build time assertion in header is making the perf
build fail on x86 with:

  ../../include/linux/perf_event.h:411:32: error: variably modified \
		â__assert_mmap_data_head_offsetâ at file scope [-Werror]

I'm moving the build time validation out of the header, because
I think it's better than to lessen the perf build warn/error
check.

Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: acme@xxxxxxxxxx
Cc: a.p.zijlstra@xxxxxxxxx
Cc: paulus@xxxxxxxxx
Cc: cjashfor@xxxxxxxxxxxxxxxxxx
Cc: fweisbec@xxxxxxxxx
Link: http://lkml.kernel.org/r/1332513680-7870-1-git-send-email-jolsa@xxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
 include/linux/perf_event.h |    7 -------
 kernel/events/core.c       |    7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index ca9ed4e..ddbb6a9 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -403,13 +403,6 @@ struct perf_event_mmap_page {
 	__u64	data_tail;		/* user-space written tail */
 };
 
-/*
- * Build time assertion that we keep the data_head at the intended location.
- * IOW, validation we got the __reserved[] size right.
- */
-extern char __assert_mmap_data_head_offset
-	[1 - 2*!!(offsetof(struct perf_event_mmap_page, data_head) != 1024)];
-
 #define PERF_RECORD_MISC_CPUMODE_MASK		(7 << 0)
 #define PERF_RECORD_MISC_CPUMODE_UNKNOWN	(0 << 0)
 #define PERF_RECORD_MISC_KERNEL			(1 << 0)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index dc3b052..3f92a19 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7116,6 +7116,13 @@ void __init perf_event_init(void)
 
 	/* do not patch jump label more than once per second */
 	jump_label_rate_limit(&perf_sched_events, HZ);
+
+	/*
+	 * Build time assertion that we keep the data_head at the intended
+	 * location.  IOW, validation we got the __reserved[] size right.
+	 */
+	BUILD_BUG_ON((offsetof(struct perf_event_mmap_page, data_head))
+		     != 1024);
 }
 
 static int __init perf_event_sysfs_init(void)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/