mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-08-29 05:18:51 +09:00
![Heiko Schocher](/assets/img/avatar_default.png)
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>
112 lines
2.2 KiB
C
112 lines
2.2 KiB
C
/*
|
|
* linux/include/asm-arm/atomic.h
|
|
*
|
|
* Copyright (c) 1996 Russell King.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* Changelog:
|
|
* 27-06-1996 RMK Created
|
|
* 13-04-1997 RMK Made functions atomic!
|
|
* 07-12-1997 RMK Upgraded for v2.1.
|
|
* 26-08-1998 PJB Added #ifdef __KERNEL__
|
|
*/
|
|
#ifndef __ASM_ARM_ATOMIC_H
|
|
#define __ASM_ARM_ATOMIC_H
|
|
|
|
#ifdef CONFIG_SMP
|
|
#error SMP not supported
|
|
#endif
|
|
|
|
typedef struct { volatile int counter; } atomic_t;
|
|
|
|
#define ATOMIC_INIT(i) { (i) }
|
|
|
|
#ifdef __KERNEL__
|
|
#include <asm/proc-armv/system.h>
|
|
|
|
#define atomic_read(v) ((v)->counter)
|
|
#define atomic_set(v,i) (((v)->counter) = (i))
|
|
|
|
static inline void atomic_add(int i, volatile atomic_t *v)
|
|
{
|
|
unsigned long flags = 0;
|
|
|
|
local_irq_save(flags);
|
|
v->counter += i;
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
static inline void atomic_sub(int i, volatile atomic_t *v)
|
|
{
|
|
unsigned long flags = 0;
|
|
|
|
local_irq_save(flags);
|
|
v->counter -= i;
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
static inline void atomic_inc(volatile atomic_t *v)
|
|
{
|
|
unsigned long flags = 0;
|
|
|
|
local_irq_save(flags);
|
|
v->counter += 1;
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
static inline void atomic_dec(volatile atomic_t *v)
|
|
{
|
|
unsigned long flags = 0;
|
|
|
|
local_irq_save(flags);
|
|
v->counter -= 1;
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
static inline int atomic_dec_and_test(volatile atomic_t *v)
|
|
{
|
|
unsigned long flags = 0;
|
|
int val;
|
|
|
|
local_irq_save(flags);
|
|
val = v->counter;
|
|
v->counter = val -= 1;
|
|
local_irq_restore(flags);
|
|
|
|
return val == 0;
|
|
}
|
|
|
|
static inline int atomic_add_negative(int i, volatile atomic_t *v)
|
|
{
|
|
unsigned long flags = 0;
|
|
int val;
|
|
|
|
local_irq_save(flags);
|
|
val = v->counter;
|
|
v->counter = val += i;
|
|
local_irq_restore(flags);
|
|
|
|
return val < 0;
|
|
}
|
|
|
|
static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
|
|
{
|
|
unsigned long flags = 0;
|
|
|
|
local_irq_save(flags);
|
|
*addr &= ~mask;
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
/* Atomic operations are already serializing on ARM */
|
|
#define smp_mb__before_atomic_dec() barrier()
|
|
#define smp_mb__after_atomic_dec() barrier()
|
|
#define smp_mb__before_atomic_inc() barrier()
|
|
#define smp_mb__after_atomic_inc() barrier()
|
|
|
|
#endif
|
|
#endif
|