projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull virt-cpu-accounting into release branch
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-cris
/
bitops.h
diff --git
a/include/asm-cris/bitops.h
b/include/asm-cris/bitops.h
index a569065113d916671f7562c946a8c7690de60fd7..75ea6e0964839de32831162c7338218db9072435 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__
/* 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>
#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
/*
* set_bit - Atomically set a bit in memory
* @nr: the bit to set
@@
-154,6
+151,7
@@
static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
#include <asm-generic/bitops/fls64.h>
#include <asm-generic/bitops/hweight.h>
#include <asm-generic/bitops/find.h>
#include <asm-generic/bitops/fls64.h>
#include <asm-generic/bitops/hweight.h>
#include <asm-generic/bitops/find.h>
+#include <asm-generic/bitops/lock.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/ext2-non-atomic.h>