Fix compilation error due to undefined ACCESS_ONCE macro.

When CONFIG_DEBUG_MUTEXES is turned on in RHEL5's kernel config, the mutexes
store the owner for debugging purposes, therefore the SPL will enable
HAVE_MUTEX_OWNER. However, the SPL code uses ACCESS_ONCE() to access the
owner, and this macro is not defined in the RHEL5 kernel, therefore we define it
ourselves in include/linux/compiler_compat.h.

Signed-off-by: Ricardo M. Correia <ricardo.correia@oracle.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/include/linux/compiler_compat.h b/include/linux/compiler_compat.h
new file mode 100644 (file)
index 0000000..de3b3c3
--- /dev/null
+++ b/include/linux/compiler_compat.h
@@ -0,0 +1,47 @@
+/*****************************************************************************\
+ *  Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
+ *  Copyright (C) 2007 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  Written by Brian Behlendorf <behlendorf1@llnl.gov>.
+ *  UCRL-CODE-235197
+ *
+ *  This file is part of the SPL, Solaris Porting Layer.
+ *  For details, see <http://github.com/behlendorf/spl/>.
+ *
+ *  The SPL is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation; either version 2 of the License, or (at your
+ *  option) any later version.
+ *
+ *  The SPL is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with the SPL.  If not, see <http://www.gnu.org/licenses/>.
+\*****************************************************************************/
+
+#ifndef _SPL_COMPILER_COMPAT_H
+#define _SPL_COMPILER_COMPAT_H
+
+#include <linux/compiler.h>
+
+#ifndef ACCESS_ONCE
+/*
+ * Prevent the compiler from merging or refetching accesses.  The compiler
+ * is also forbidden from reordering successive instances of ACCESS_ONCE(),
+ * but only when the compiler is aware of some particular ordering.  One way
+ * to make the compiler aware of ordering is to put the two invocations of
+ * ACCESS_ONCE() in different C statements.
+ *
+ * This macro does absolutely -nothing- to prevent the CPU from reordering,
+ * merging, or refetching absolutely anything at any time.  Its main intended
+ * use is to mediate communication between process-level code and irq/NMI
+ * handlers, all running on the same CPU.
+ */
+/* Taken from 2.6.33.2 */
+# define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
+#endif
+
+#endif /* _SPL_COMPILER_COMPAT_H */

diff --git a/include/sys/mutex.h b/include/sys/mutex.h
index d33694766d52b37b5a62cbc6ad15caf7874816ea..ce8c0f4e91fbbce62442e213468fea67b3564f15 100644 (file)
--- a/include/sys/mutex.h
+++ b/include/sys/mutex.h
@@ -27,6 +27,7 @@
 
 #include <sys/types.h>
 #include <linux/mutex.h>
+#include <linux/compiler_compat.h>
 
 typedef enum {
         MUTEX_DEFAULT  = 0,