From: David Smith <dsmith@redhat.com>
Date: Wed, 14 Dec 2016 16:07:15 +0000 (-0600)
Subject: Improve relayfs autoconf test for F24.
X-Git-Tag: release-3.1~528
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=1f19391ee8b8a70dd93db0558a15a4c9402ebe1f;p=systemtap.git

Improve relayfs autoconf test for F24.

* runtime/linux/autoconf-relay_buf-per_cpu_ptr.c: Improve test so that it
  properly fails on Fedora 24's 4.8.10-200.fc24.x86_64 kernel.
---

diff --git a/runtime/linux/autoconf-relay_buf-per_cpu_ptr.c b/runtime/linux/autoconf-relay_buf-per_cpu_ptr.c
index d2af8d32d..c105b3301 100644
--- a/runtime/linux/autoconf-relay_buf-per_cpu_ptr.c
+++ b/runtime/linux/autoconf-relay_buf-per_cpu_ptr.c
@@ -14,14 +14,13 @@
 //
 // changed the way the 'rchan->buf' field works. It just to be a
 // regular array, and is now a per_cpu_ptr-style array.
-//
-// If we can call per_cpu_ptr() on rchan->buf, we'll assume that we've
-// got the new style relay channel buffer pointers.
 
 #include <linux/relay.h>
 #include <linux/percpu.h>
+#include <linux/bug.h>
 
 struct rchan_buf *relay_buf_test(struct rchan *chan, unsigned int cpu)
 {
+    BUILD_BUG_ON(sizeof(chan->buf) != sizeof(struct rchan_buf **));
     return *per_cpu_ptr(chan->buf, cpu);
 }