[PATCH] arch: asm-geniric: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'

public inbox for linux-s390@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH] arch: asm-geniric: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'
@ 2013-06-08  7:50 Chen Gang
  2013-06-08  8:31 ` Geert Uytterhoeven
       [not found] ` <20130608174914.eeHhvmZcCsRlKposRfBiFiFNg8EeNWDR7eq3ilmJ2F8@z>
  0 siblings, 2 replies; 12+ messages in thread
From: Chen Gang @ 2013-06-08  7:50 UTC (permalink / raw)
  To: Mike Frysinger, takata, Martin Schwidefsky, Heiko Carstens,
	Arnd Bergmann, realmz paranoid
  Cc: linux390, uclinux-dist-devel@blackfin.uclinux.org,
	linux-kernel@vger.kernel.org, linux-m32r, linux-m32r-ja,
	linux-s390, Linux-Arch


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@asianux.com>
---
 arch/blackfin/include/asm/atomic.h |    4 ++--
 arch/m32r/include/asm/atomic.h     |    4 ++--
 arch/s390/include/asm/atomic.h     |    4 ++--
 include/asm-generic/atomic.h       |    2 +-
 4 files changed, 7 insertions(+), 7 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..233c743 100644
--- a/arch/m32r/include/asm/atomic.h
+++ b/arch/m32r/include/asm/atomic.h
@@ -264,7 +264,7 @@ 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;
@@ -286,7 +286,7 @@ 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;
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

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH] arch: asm-geniric: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'
  2013-06-08  7:50 [PATCH] arch: asm-geniric: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long' Chen Gang
@ 2013-06-08  8:31 ` Geert Uytterhoeven
  2013-06-08  8:37   ` Chen Gang
       [not found] ` <20130608174914.eeHhvmZcCsRlKposRfBiFiFNg8EeNWDR7eq3ilmJ2F8@z>
  1 sibling, 1 reply; 12+ messages in thread
From: Geert Uytterhoeven @ 2013-06-08  8:31 UTC (permalink / raw)
  To: Chen Gang
  Cc: Mike Frysinger, Hirokazu Takata, Martin Schwidefsky,
	Heiko Carstens, Arnd Bergmann, realmz paranoid, linux390,
	uclinux-dist-devel@blackfin.uclinux.org,
	linux-kernel@vger.kernel.org, linux-m32r, linux-m32r-ja,
	linux-s390, Linux-Arch

Haven't done a real review, but my eye fell on it:

On Sat, Jun 8, 2013 at 9:50 AM, Chen Gang <gang.chen@asianux.com> wrote:
> diff --git a/arch/m32r/include/asm/atomic.h b/arch/m32r/include/asm/atomic.h
> index 0d81697..233c743 100644
> --- a/arch/m32r/include/asm/atomic.h
> +++ b/arch/m32r/include/asm/atomic.h
> @@ -264,7 +264,7 @@ 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;

Shouldn't this become "unsigned int tmp" for consistency, too?

> @@ -286,7 +286,7 @@ 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;

Likewise.

There may be other places that need changes.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] arch: asm-geniric: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'
  2013-06-08  8:31 ` Geert Uytterhoeven
@ 2013-06-08  8:37   ` Chen Gang
  0 siblings, 0 replies; 12+ messages in thread
From: Chen Gang @ 2013-06-08  8:37 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Mike Frysinger, Hirokazu Takata, Martin Schwidefsky,
	Heiko Carstens, Arnd Bergmann, realmz paranoid, linux390,
	uclinux-dist-devel@blackfin.uclinux.org,
	linux-kernel@vger.kernel.org, linux-m32r, linux-m32r-ja,
	linux-s390, Linux-Arch

On 06/08/2013 04:31 PM, Geert Uytterhoeven wrote:
> Haven't done a real review, but my eye fell on it:
> 

Thank you for your review, firstly.

> On Sat, Jun 8, 2013 at 9:50 AM, Chen Gang <gang.chen@asianux.com> wrote:
>> > diff --git a/arch/m32r/include/asm/atomic.h b/arch/m32r/include/asm/atomic.h
>> > index 0d81697..233c743 100644
>> > --- a/arch/m32r/include/asm/atomic.h
>> > +++ b/arch/m32r/include/asm/atomic.h
>> > @@ -264,7 +264,7 @@ 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;
> Shouldn't this become "unsigned int tmp" for consistency, too?
> 

It seems better. (although I guess: for 'm32r', both 'long' and 'int'
are 32-bit).

I will wait for 1 day at least, if no additional suggestions or
completions, I will send patch v2.

>> > @@ -286,7 +286,7 @@ 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;
> Likewise.
> 
> There may be other places that need changes.

OK, I will check them.


Thanks.
-- 
Chen Gang

Asianux Corporation

^ permalink raw reply	[flat|nested] 12+ messages in thread

[parent not found: <20130608174914.eeHhvmZcCsRlKposRfBiFiFNg8EeNWDR7eq3ilmJ2F8@z>]

* Re: [PATCH] arch: asm-geniric: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'
       [not found] ` <20130608174914.eeHhvmZcCsRlKposRfBiFiFNg8EeNWDR7eq3ilmJ2F8@z>
@ 2013-06-08 17:49   ` Bjorn Helgaas
  2013-06-09  1:52     ` Chen Gang
  2013-06-09  6:31     ` [PATCH v2] arch: asm-generic: " Chen Gang
  0 siblings, 2 replies; 12+ messages in thread
From: Bjorn Helgaas @ 2013-06-08 17:49 UTC (permalink / raw)
  To: Chen Gang
  Cc: Mike Frysinger, takata, Martin Schwidefsky, Heiko Carstens,
	Arnd Bergmann, realmz paranoid, linux390,
	uclinux-dist-devel@blackfin.uclinux.org,
	linux-kernel@vger.kernel.org, linux-m32r, linux-m32r-ja,
	linux-s390, Linux-Arch

s/geniric/generic/ in subject

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] arch: asm-geniric: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'
  2013-06-08 17:49   ` Bjorn Helgaas
@ 2013-06-09  1:52     ` Chen Gang
  2013-06-10 17:00       ` Bjorn Helgaas
  2013-06-09  6:31     ` [PATCH v2] arch: asm-generic: " Chen Gang
  1 sibling, 1 reply; 12+ messages in thread
From: Chen Gang @ 2013-06-09  1:52 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Mike Frysinger, takata, Martin Schwidefsky, Heiko Carstens,
	Arnd Bergmann, realmz paranoid, linux390,
	uclinux-dist-devel@blackfin.uclinux.org,
	linux-kernel@vger.kernel.org, linux-m32r, linux-m32r-ja,
	linux-s390, Linux-Arch

On 06/09/2013 01:49 AM, Bjorn Helgaas wrote:
> s/geniric/generic/ in subject
> 

Could you provide more details information ?

Thanks.
-- 
Chen Gang

Asianux Corporation

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] arch: asm-geniric: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'
  2013-06-09  1:52     ` Chen Gang
@ 2013-06-10 17:00       ` Bjorn Helgaas
  2013-06-13  1:47         ` Chen Gang
  0 siblings, 1 reply; 12+ messages in thread
From: Bjorn Helgaas @ 2013-06-10 17:00 UTC (permalink / raw)
  To: Chen Gang
  Cc: Mike Frysinger, takata, Martin Schwidefsky, Heiko Carstens,
	Arnd Bergmann, realmz paranoid, linux390,
	uclinux-dist-devel@blackfin.uclinux.org,
	linux-kernel@vger.kernel.org, linux-m32r, linux-m32r-ja,
	linux-s390, Linux-Arch

On Sat, Jun 8, 2013 at 7:52 PM, Chen Gang <gang.chen@asianux.com> wrote:
> On 06/09/2013 01:49 AM, Bjorn Helgaas wrote:
>> s/geniric/generic/ in subject
>>
>
> Could you provide more details information ?

In your subject line, "geniric" is spelled incorrectly.  The correct
spelling is "generic."

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] arch: asm-geniric: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'
  2013-06-10 17:00       ` Bjorn Helgaas
@ 2013-06-13  1:47         ` Chen Gang
  0 siblings, 0 replies; 12+ messages in thread
From: Chen Gang @ 2013-06-13  1:47 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Mike Frysinger, takata, Martin Schwidefsky, Heiko Carstens,
	Arnd Bergmann, realmz paranoid, linux390,
	uclinux-dist-devel@blackfin.uclinux.org,
	linux-kernel@vger.kernel.org, linux-m32r, linux-m32r-ja,
	linux-s390, Linux-Arch

On 06/11/2013 01:00 AM, Bjorn Helgaas wrote:
> On Sat, Jun 8, 2013 at 7:52 PM, Chen Gang <gang.chen@asianux.com> wrote:
>> > On 06/09/2013 01:49 AM, Bjorn Helgaas wrote:
>>> >> s/geniric/generic/ in subject
>>> >>
>> >
>> > Could you provide more details information ?
> In your subject line, "geniric" is spelled incorrectly.  The correct
> spelling is "generic."
> 
> 

Thanks.

-- 
Chen Gang

Asianux Corporation

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH v2] arch: asm-generic: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'
  2013-06-08 17:49   ` Bjorn Helgaas
  2013-06-09  1:52     ` Chen Gang
@ 2013-06-09  6:31     ` Chen Gang
       [not found]       ` <20130610092106.kdfBh7OX5Mqmccur5uFv06CHQ52fsXy-rrvKjQkFKjw@z>
  1 sibling, 1 reply; 12+ messages in thread
From: Chen Gang @ 2013-06-09  6:31 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Mike Frysinger, takata, Martin Schwidefsky, Heiko Carstens,
	Arnd Bergmann, realmz paranoid, linux390,
	uclinux-dist-devel@blackfin.uclinux.org,
	linux-kernel@vger.kernel.org, linux-m32r, linux-m32r-ja,
	linux-s390, Linux-Arch, Marc Gauthier


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@asianux.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

^ permalink raw reply related	[flat|nested] 12+ messages in thread

[parent not found: <20130610092106.kdfBh7OX5Mqmccur5uFv06CHQ52fsXy-rrvKjQkFKjw@z>]

* Re: [PATCH v2] arch: asm-generic: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'
       [not found]       ` <20130610092106.kdfBh7OX5Mqmccur5uFv06CHQ52fsXy-rrvKjQkFKjw@z>
@ 2013-06-10  9:21         ` Heiko Carstens
  2013-06-13  1:19           ` Chen Gang
  0 siblings, 1 reply; 12+ messages in thread
From: Heiko Carstens @ 2013-06-10  9:21 UTC (permalink / raw)
  To: Chen Gang
  Cc: Bjorn Helgaas, Mike Frysinger, takata, Martin Schwidefsky,
	Arnd Bergmann, realmz paranoid, linux390,
	uclinux-dist-devel@blackfin.uclinux.org,
	linux-kernel@vger.kernel.org, linux-m32r, linux-m32r-ja,
	linux-s390, Linux-Arch, Marc Gauthier

On Sun, Jun 09, 2013 at 02:31:42PM +0800, Chen Gang wrote:
> 
> 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').
> 
> Signed-off-by: Chen Gang <gang.chen@asianux.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(-)

For the s390 part:

Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v2] arch: asm-generic: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'
  2013-06-10  9:21         ` Heiko Carstens
@ 2013-06-13  1:19           ` Chen Gang
  2013-06-26  2:03             ` Chen Gang
  0 siblings, 1 reply; 12+ messages in thread
From: Chen Gang @ 2013-06-13  1:19 UTC (permalink / raw)
  To: Heiko Carstens
  Cc: Bjorn Helgaas, Mike Frysinger, takata, Martin Schwidefsky,
	Arnd Bergmann, realmz paranoid, linux390,
	uclinux-dist-devel@blackfin.uclinux.org,
	linux-kernel@vger.kernel.org, linux-m32r, linux-m32r-ja,
	linux-s390, Linux-Arch, Marc Gauthier

On 06/10/2013 05:21 PM, Heiko Carstens wrote:
> On Sun, Jun 09, 2013 at 02:31:42PM +0800, Chen Gang wrote:
>> > 
>> > 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').
>> > 
>> > Signed-off-by: Chen Gang <gang.chen@asianux.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(-)
> For the s390 part:
> 
> Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> 

Thank you very much !!


-- 
Chen Gang

Asianux Corporation

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v2] arch: asm-generic: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'
  2013-06-13  1:19           ` Chen Gang
@ 2013-06-26  2:03             ` Chen Gang
  2013-07-05  1:11               ` Chen Gang
  0 siblings, 1 reply; 12+ messages in thread
From: Chen Gang @ 2013-06-26  2:03 UTC (permalink / raw)
  To: uclinux-dist-devel@blackfin.uclinux.org, linux-m32r,
	linux-m32r-ja
  Cc: Heiko Carstens, Bjorn Helgaas, Mike Frysinger, takata,
	Martin Schwidefsky, Arnd Bergmann, realmz paranoid, linux390,
	linux-kernel@vger.kernel.org, linux-s390, Linux-Arch,
	Marc Gauthier, Andrew Morton

Hello Maintainers:

Firstly thank the s390 maintainers again for their 'Acked-by' (in my
memory, s390 is the most important business mainframe machine)

Could another related maintainers give a glance for it, when you have time.

Thanks.

On 06/13/2013 09:19 AM, Chen Gang wrote:
> On 06/10/2013 05:21 PM, Heiko Carstens wrote:
>> On Sun, Jun 09, 2013 at 02:31:42PM +0800, Chen Gang wrote:
>>>>
>>>> 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').
>>>>
>>>> Signed-off-by: Chen Gang <gang.chen@asianux.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(-)
>> For the s390 part:
>>
>> Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
>>
> 
> Thank you very much !!
> 
> 


-- 
Chen Gang

Asianux Corporation

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v2] arch: asm-generic: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long'
  2013-06-26  2:03             ` Chen Gang
@ 2013-07-05  1:11               ` Chen Gang
  0 siblings, 0 replies; 12+ messages in thread
From: Chen Gang @ 2013-07-05  1:11 UTC (permalink / raw)
  To: uclinux-dist-devel@blackfin.uclinux.org, linux-m32r,
	linux-m32r-ja
  Cc: Heiko Carstens, Bjorn Helgaas, Mike Frysinger, takata,
	Martin Schwidefsky, Arnd Bergmann, realmz paranoid, linux390,
	linux-kernel@vger.kernel.org, linux-s390, Linux-Arch,
	Marc Gauthier, Andrew Morton, Greg KH

Hello Maintainers:

Please help check this patch whether OK, when you have time.

Thanks.

On 06/26/2013 10:03 AM, Chen Gang wrote:
> Hello Maintainers:
> 
> Firstly thank the s390 maintainers again for their 'Acked-by' (in my
> memory, s390 is the most important business mainframe machine)
> 
> Could another related maintainers give a glance for it, when you have time.
> 
> Thanks.
> 
> On 06/13/2013 09:19 AM, Chen Gang wrote:
>> On 06/10/2013 05:21 PM, Heiko Carstens wrote:
>>> On Sun, Jun 09, 2013 at 02:31:42PM +0800, Chen Gang wrote:
>>>>>
>>>>> 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').
>>>>>
>>>>> Signed-off-by: Chen Gang <gang.chen@asianux.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(-)
>>> For the s390 part:
>>>
>>> Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
>>>
>>
>> Thank you very much !!
>>
>>
> 
> 


-- 
Chen Gang

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2013-07-05  1:11 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-08  7:50 [PATCH] arch: asm-geniric: for atomic_set_mask() 1st param, use 'unsigned int' instead of 'unsigned long' Chen Gang
2013-06-08  8:31 ` Geert Uytterhoeven
2013-06-08  8:37   ` Chen Gang
     [not found] ` <20130608174914.eeHhvmZcCsRlKposRfBiFiFNg8EeNWDR7eq3ilmJ2F8@z>
2013-06-08 17:49   ` Bjorn Helgaas
2013-06-09  1:52     ` Chen Gang
2013-06-10 17:00       ` Bjorn Helgaas
2013-06-13  1:47         ` Chen Gang
2013-06-09  6:31     ` [PATCH v2] arch: asm-generic: " Chen Gang
     [not found]       ` <20130610092106.kdfBh7OX5Mqmccur5uFv06CHQ52fsXy-rrvKjQkFKjw@z>
2013-06-10  9:21         ` Heiko Carstens
2013-06-13  1:19           ` Chen Gang
2013-06-26  2:03             ` Chen Gang
2013-07-05  1:11               ` Chen Gang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox