diff options
author | Tom Rini <trini@ti.com> | 2014-06-24 14:06:22 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-06-24 14:06:22 -0400 |
commit | ba9b42c81b0734d53edfbb1fe4a6ded7de78c5ab (patch) | |
tree | 4a2a320c917e0ec10908b25b0878a62b3210f00b /arch/sandbox/include/asm/bitops.h | |
parent | 19198f8b013b70ae6f497422e5418cc009dea145 (diff) | |
parent | 1638d98052e0d03e46d504b21ec1b88ecfcd87aa (diff) |
Merge branch 'sandbox' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/sandbox/include/asm/bitops.h')
-rw-r--r-- | arch/sandbox/include/asm/bitops.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sandbox/include/asm/bitops.h b/arch/sandbox/include/asm/bitops.h index 74219c56a7f..e807c4ef34b 100644 --- a/arch/sandbox/include/asm/bitops.h +++ b/arch/sandbox/include/asm/bitops.h @@ -17,6 +17,7 @@ #ifndef __ASM_SANDBOX_BITOPS_H #define __ASM_SANDBOX_BITOPS_H +#include <linux/compiler.h> #include <asm/system.h> #ifdef __KERNEL__ @@ -53,7 +54,7 @@ static inline int __test_and_set_bit(int nr, void *addr) static inline int test_and_set_bit(int nr, void *addr) { - unsigned long flags; + unsigned long __always_unused flags; int out; local_irq_save(flags); @@ -75,7 +76,7 @@ static inline int __test_and_clear_bit(int nr, void *addr) static inline int test_and_clear_bit(int nr, void *addr) { - unsigned long flags; + unsigned long __always_unused flags; int out; local_irq_save(flags); |