Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / include / asm-cris / bitops.h

diff --git a/include/asm-cris/bitops.h b/include/asm-cris/bitops.h
index 617151b..75ea6e0 100644 (file)
--- a/include/asm-cris/bitops.h
+++ b/include/asm-cris/bitops.h
@@ -14,18 +14,15 @@
 /* Currently this is unsuitable for consumption outside the kernel.  */
 #ifdef __KERNEL__ 
 
+#ifndef _LINUX_BITOPS_H
+#error only <linux/bitops.h> can be included directly
+#endif
+
 #include <asm/arch/bitops.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <linux/compiler.h>
 
-/*
- * Some hacks to defeat gcc over-optimizations..
- */
-struct __dummy { unsigned long a[100]; };
-#define ADDR (*(struct __dummy *) addr)
-#define CONST_ADDR (*(const struct __dummy *) addr)
-
 /*
  * set_bit - Atomically set a bit in memory
  * @nr: the bit to set