summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2015-11-30 08:47:42 +0100
committerTom Rini <trini@konsulko.com>2016-01-20 10:03:58 -0500
commit1d48ca69e5cb0538b0cae8fa651d2cb2eb97b2cb (patch)
tree5a9cc76675e95764987b516b0598b0688ae53a23
parent048c61d674c4e5c793f5391fb7a57c8c79c99ebd (diff)
downloadblackbird-obmc-uboot-1d48ca69e5cb0538b0cae8fa651d2cb2eb97b2cb.tar.gz
blackbird-obmc-uboot-1d48ca69e5cb0538b0cae8fa651d2cb2eb97b2cb.zip
arm, ubifs: fix gcc5.x compiler warning
compiling U-Boot for openrd_base_defconfig with gcc 5.x shows the following warning: CC fs/ubifs/super.o In file included from fs/ubifs/ubifs.h:35:0, from fs/ubifs/super.c:37: fs/ubifs/super.c: In function 'atomic_inc': ./arch/arm/include/asm/atomic.h:55:2: warning: 'flags' is used uninitialized in this function [-Wuninitialized] local_irq_save(flags); ^ fs/ubifs/super.c: In function 'atomic_dec': ./arch/arm/include/asm/atomic.h:64:2: warning: 'flags' is used uninitialized in this function [-Wuninitialized] local_irq_save(flags); ^ CC fs/ubifs/sb.o [...] CC fs/ubifs/lpt.o In file included from include/linux/bitops.h:123:0, from include/common.h:20, from include/ubi_uboot.h:17, from fs/ubifs/ubifs.h:37, from fs/ubifs/lpt.c:35: fs/ubifs/lpt.c: In function 'test_and_set_bit': ./arch/arm/include/asm/bitops.h:57:2: warning: 'flags' is used uninitialized in this function [-Wuninitialized] local_irq_save(flags); ^ CC fs/ubifs/lpt_commit.o In file included from include/linux/bitops.h:123:0, from include/common.h:20, from include/ubi_uboot.h:17, from fs/ubifs/ubifs.h:37, from fs/ubifs/lpt_commit.c:26: fs/ubifs/lpt_commit.c: In function 'test_and_set_bit': ./arch/arm/include/asm/bitops.h:57:2: warning: 'flags' is used uninitialized in this function [-Wuninitialized] local_irq_save(flags); ^ CC fs/ubifs/scan.o CC fs/ubifs/lprops.o CC fs/ubifs/tnc.o In file included from include/linux/bitops.h:123:0, from include/common.h:20, from include/ubi_uboot.h:17, from fs/ubifs/ubifs.h:37, from fs/ubifs/tnc.c:30: fs/ubifs/tnc.c: In function 'test_and_set_bit': ./arch/arm/include/asm/bitops.h:57:2: warning: 'flags' is used uninitialized in this function [-Wuninitialized] local_irq_save(flags); ^ CC fs/ubifs/tnc_misc.o Fix it. Signed-off-by: Heiko Schocher <hs@denx.de>
-rw-r--r--arch/arm/include/asm/atomic.h14
-rw-r--r--arch/arm/include/asm/bitops.h4
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
index 34c07fe500..9b79506b59 100644
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
@@ -32,7 +32,7 @@ typedef struct { volatile int counter; } atomic_t;
static inline void atomic_add(int i, volatile atomic_t *v)
{
- unsigned long flags;
+ unsigned long flags = 0;
local_irq_save(flags);
v->counter += i;
@@ -41,7 +41,7 @@ static inline void atomic_add(int i, volatile atomic_t *v)
static inline void atomic_sub(int i, volatile atomic_t *v)
{
- unsigned long flags;
+ unsigned long flags = 0;
local_irq_save(flags);
v->counter -= i;
@@ -50,7 +50,7 @@ static inline void atomic_sub(int i, volatile atomic_t *v)
static inline void atomic_inc(volatile atomic_t *v)
{
- unsigned long flags;
+ unsigned long flags = 0;
local_irq_save(flags);
v->counter += 1;
@@ -59,7 +59,7 @@ static inline void atomic_inc(volatile atomic_t *v)
static inline void atomic_dec(volatile atomic_t *v)
{
- unsigned long flags;
+ unsigned long flags = 0;
local_irq_save(flags);
v->counter -= 1;
@@ -68,7 +68,7 @@ static inline void atomic_dec(volatile atomic_t *v)
static inline int atomic_dec_and_test(volatile atomic_t *v)
{
- unsigned long flags;
+ unsigned long flags = 0;
int val;
local_irq_save(flags);
@@ -81,7 +81,7 @@ static inline int atomic_dec_and_test(volatile atomic_t *v)
static inline int atomic_add_negative(int i, volatile atomic_t *v)
{
- unsigned long flags;
+ unsigned long flags = 0;
int val;
local_irq_save(flags);
@@ -94,7 +94,7 @@ static inline int atomic_add_negative(int i, volatile atomic_t *v)
static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
{
- unsigned long flags;
+ unsigned long flags = 0;
local_irq_save(flags);
*addr &= ~mask;
diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h
index d479a38291..f33efeb33e 100644
--- a/arch/arm/include/asm/bitops.h
+++ b/arch/arm/include/asm/bitops.h
@@ -51,7 +51,7 @@ static inline int __test_and_set_bit(int nr, volatile void *addr)
static inline int test_and_set_bit(int nr, volatile void * addr)
{
- unsigned long flags;
+ unsigned long flags = 0;
int out;
local_irq_save(flags);
@@ -73,7 +73,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr)
static inline int test_and_clear_bit(int nr, volatile void * addr)
{
- unsigned long flags;
+ unsigned long flags = 0;
int out;
local_irq_save(flags);
OpenPOWER on IntegriCloud