| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <51B4214E.6090007@asianux.com>
Date: Sun, 09 Jun 2013 14:31:42 +0800
From: Chen Gang <gang.chen@...anux.com>
To: Bjorn Helgaas <bhelgaas@...gle.com>
CC: Mike Frysinger <vapier@...too.org>, takata@...ux-m32r.org,
Martin Schwidefsky <schwidefsky@...ibm.com>,
Heiko Carstens <heiko.carstens@...ibm.com>,
Arnd Bergmann <arnd@...db.de>,
realmz paranoid <realmz6@...il.com>, linux390@...ibm.com,
"uclinux-dist-devel@...ckfin.uclinux.org"
<uclinux-dist-devel@...ckfin.uclinux.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
linux-m32r@...linux-m32r.org, linux-m32r-ja@...linux-m32r.org,
linux-s390@...r.kernel.org,
Linux-Arch <linux-arch@...r.kernel.org>,
Marc Gauthier <Marc.Gauthier@...silica.com>
Subject: [PATCH v2] arch: asm-generic: for atomic_set_mask() 1st param, use
'unsigned int' instead of 'unsigned long'
atomic_set_mask() and atomic_clear_mask() are the pairs, so the related
parameters' type need match with each other.
The type of 'addr->counter' is 'int', so use 'unsigned int' instead
of 'unsigned long', and let atomic_set_mask() match atomic_clear_mask().
For arch sub-system, currently, have 3 types of definition for them:
1st for 'int', 2nd for 'long', 3rd is conflict to use 'int' and 'long'.
At least, better to fix 3rd (conflict using 'int' and 'long').
using 'long':
./h8300/include/asm/atomic.h:129:static __inline__ void atomic_set_mask(unsigned long mask, unsigned long *v)
./h8300/include/asm/atomic.h:118:static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *v)
./mn10300/include/asm/atomic.h:211:static inline void atomic_set_mask(unsigned long mask, unsigned long *addr)
./mn10300/include/asm/atomic.h:177:static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
./m68k/include/asm/atomic.h:192:static inline void atomic_set_mask(unsigned long mask, unsigned long *v)
./m68k/include/asm/atomic.h:187:static inline void atomic_clear_mask(unsigned long mask, unsigned long *v)
./frv/include/asm/bitops.h:113:#define atomic_set_mask(mask, v) atomic_test_and_OR_mask((mask), (v))
./frv/include/asm/bitops.h:112:#define atomic_clear_mask(mask, v) atomic_test_and_ANDNOT_mask((mask), (v))
./x86/include/asm/atomic.h:260:#define atomic_set_mask(mask, addr) \
./x86/include/asm/atomic.h:256:#define atomic_clear_mask(mask, addr) \
also using 'long': (but only atomic_clear_mask, no atomic_set_mask)
./arm64/include/asm/atomic.h:129:static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
./arc/include/asm/atomic.h:89:static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
./arc/include/asm/atomic.h:182:static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
./arm/include/asm/atomic.h:137:static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
./arm/include/asm/atomic.h:200:static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
using 'int':
./metag/include/asm/atomic_lock1.h:100:static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
./metag/include/asm/atomic_lnkget.h:127:static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
./metag/include/asm/atomic_lock1.h:90:static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
./metag/include/asm/atomic_lnkget.h:110:static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
./sh/include/asm/atomic-grb.h:104:static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
./sh/include/asm/atomic-irq.h:64:static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
./sh/include/asm/atomic-llsc.h:93:static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
./sh/include/asm/atomic-grb.h:84:static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
./sh/include/asm/atomic-irq.h:55:static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
./sh/include/asm/atomic-llsc.h:79:static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
./xtensa/include/asm/atomic.h:357:static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
./xtensa/include/asm/atomic.h:322:static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
also using 'int', (better to notice 'signed' and 'unsigned'):
./blackfin/include/asm/atomic.h:31:#define atomic_set_mask(m, v) __raw_atomic_set_asm(&(v)->counter, m)
./blackfin/include/asm/atomic.h:30:#define atomic_clear_mask(m, v) __raw_atomic_clear_asm(&(v)->counter, m)
conflict to use 'int' and 'long':
./m32r/include/asm/atomic.h:289:static __inline__ void atomic_set_mask(unsigned long mask, atomic_t *addr)
./m32r/include/asm/atomic.h:267:static __inline__ void atomic_clear_mask(unsigned long mask, atomic_t *addr)
./s390/include/asm/atomic.h:79:static inline void atomic_set_mask(unsigned long mask, atomic_t *v)
./s390/include/asm/atomic.h:74:static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
(in fact, 'generic' is also conflict to use 'int' and 'long')
Signed-off-by: Chen Gang <gang.chen@...anux.com>
---
arch/blackfin/include/asm/atomic.h | 4 ++--
arch/m32r/include/asm/atomic.h | 8 ++++----
arch/s390/include/asm/atomic.h | 4 ++--
include/asm-generic/atomic.h | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h
index a107a98..feefef8 100644
--- a/arch/blackfin/include/asm/atomic.h
+++ b/arch/blackfin/include/asm/atomic.h
@@ -27,8 +27,8 @@ asmlinkage int __raw_atomic_test_asm(const volatile int *ptr, int value);
#define atomic_add_return(i, v) __raw_atomic_update_asm(&(v)->counter, i)
#define atomic_sub_return(i, v) __raw_atomic_update_asm(&(v)->counter, -(i))
-#define atomic_clear_mask(m, v) __raw_atomic_clear_asm(&(v)->counter, m)
-#define atomic_set_mask(m, v) __raw_atomic_set_asm(&(v)->counter, m)
+#define atomic_clear_mask(m, v) __raw_atomic_clear_asm(&(v)->counter, (int)(m))
+#define atomic_set_mask(m, v) __raw_atomic_set_asm(&(v)->counter, (int)(m))
#endif
diff --git a/arch/m32r/include/asm/atomic.h b/arch/m32r/include/asm/atomic.h
index 0d81697..71237e0 100644
--- a/arch/m32r/include/asm/atomic.h
+++ b/arch/m32r/include/asm/atomic.h
@@ -264,10 +264,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
}
-static __inline__ void atomic_clear_mask(unsigned long mask, atomic_t *addr)
+static __inline__ void atomic_clear_mask(unsigned int mask, atomic_t *addr)
{
unsigned long flags;
- unsigned long tmp;
+ unsigned int tmp;
local_irq_save(flags);
__asm__ __volatile__ (
@@ -286,10 +286,10 @@ static __inline__ void atomic_clear_mask(unsigned long mask, atomic_t *addr)
local_irq_restore(flags);
}
-static __inline__ void atomic_set_mask(unsigned long mask, atomic_t *addr)
+static __inline__ void atomic_set_mask(unsigned int mask, atomic_t *addr)
{
unsigned long flags;
- unsigned long tmp;
+ unsigned int tmp;
local_irq_save(flags);
__asm__ __volatile__ (
diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
index c797832..82cd683 100644
--- a/arch/s390/include/asm/atomic.h
+++ b/arch/s390/include/asm/atomic.h
@@ -71,12 +71,12 @@ static inline int atomic_sub_return(int i, atomic_t *v)
#define atomic_dec_return(_v) atomic_sub_return(1, _v)
#define atomic_dec_and_test(_v) (atomic_sub_return(1, _v) == 0)
-static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
{
__CS_LOOP(v, ~mask, "nr");
}
-static inline void atomic_set_mask(unsigned long mask, atomic_t *v)
+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
{
__CS_LOOP(v, mask, "or");
}
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index 33bd2de..f31bff97 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -153,7 +153,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
* Atomically clears the bits set in @mask from @v
*/
#ifndef atomic_clear_mask
-static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
{
unsigned long flags;
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists