diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /include/asm-cris/bitops.h | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-cris/bitops.h')
| -rw-r--r-- | include/asm-cris/bitops.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-cris/bitops.h b/include/asm-cris/bitops.h index e2f49c27ed29..75ea6e096483 100644 --- a/include/asm-cris/bitops.h +++ b/include/asm-cris/bitops.h | |||
| @@ -24,13 +24,6 @@ | |||
| 24 | #include <linux/compiler.h> | 24 | #include <linux/compiler.h> |
| 25 | 25 | ||
| 26 | /* | 26 | /* |
| 27 | * Some hacks to defeat gcc over-optimizations.. | ||
| 28 | */ | ||
| 29 | struct __dummy { unsigned long a[100]; }; | ||
| 30 | #define ADDR (*(struct __dummy *) addr) | ||
| 31 | #define CONST_ADDR (*(const struct __dummy *) addr) | ||
| 32 | |||
| 33 | /* | ||
| 34 | * set_bit - Atomically set a bit in memory | 27 | * set_bit - Atomically set a bit in memory |
| 35 | * @nr: the bit to set | 28 | * @nr: the bit to set |
| 36 | * @addr: the address to start counting from | 29 | * @addr: the address to start counting from |