2014-07-21 23:30:54

by Madhavan Srinivasan

Subject: [PATCH] cleanup include/asm-generic/atomic.h

Commit 4b358e2206 "cleanup include/asm-generic/atomic.h" added
comments for #else/#endif, but ended up adding same comment
"BITS_PER_LONG == 64" on both sides. This patch fixes it.

Signed-off-by: Madhavan Srinivasan <[email protected]>
---
include/asm-generic/atomic-long.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
index b7babf0..a8434c6 100644
--- a/include/asm-generic/atomic-long.h
+++ b/include/asm-generic/atomic-long.h
@@ -253,6 +253,6 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
#define atomic_long_xchg(v, new) \
(atomic_xchg((atomic_t *)(v), (new)))

-#endif /* BITS_PER_LONG == 64 */
+#endif /* BITS_PER_LONG != 64 */

#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
--
1.7.11.4

2014-07-22 00:08:15

by David Rientjes

Subject: Re: [PATCH] cleanup include/asm-generic/atomic.h

On Tue, 22 Jul 2014, Madhavan Srinivasan wrote:

> Commit 4b358e2206 "cleanup include/asm-generic/atomic.h" added
> comments for #else/#endif, but ended up adding same comment
> "BITS_PER_LONG == 64" on both sides. This patch fixes it.
>

It's intentionally like that, it comments the condition for which the
#endif is matched.

> Signed-off-by: Madhavan Srinivasan <[email protected]>
> ---
> include/asm-generic/atomic-long.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
> index b7babf0..a8434c6 100644
> --- a/include/asm-generic/atomic-long.h
> +++ b/include/asm-generic/atomic-long.h
> @@ -253,6 +253,6 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
> #define atomic_long_xchg(v, new) \
> (atomic_xchg((atomic_t *)(v), (new)))
>
> -#endif /* BITS_PER_LONG == 64 */
> +#endif /* BITS_PER_LONG != 64 */
>
> #endif /* _ASM_GENERIC_ATOMIC_LONG_H */

2014-07-22 03:57:38

by Madhavan Srinivasan

Subject: Re: [PATCH] cleanup include/asm-generic/atomic.h

On Tuesday 22 July 2014 05:38 AM, David Rientjes wrote:
> On Tue, 22 Jul 2014, Madhavan Srinivasan wrote:
>
>> Commit 4b358e2206 "cleanup include/asm-generic/atomic.h" added
>> comments for #else/#endif, but ended up adding same comment
>> "BITS_PER_LONG == 64" on both sides. This patch fixes it.
>>
>
> It's intentionally like that, it comments the condition for which the
> #endif is matched.

Ok, will change the else comment. And include/asm-generic/local64.h
also needs a change in comment.

Regards
Maddy

>
>> Signed-off-by: Madhavan Srinivasan <[email protected]>
>> ---
>> include/asm-generic/atomic-long.h | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
>> index b7babf0..a8434c6 100644
>> --- a/include/asm-generic/atomic-long.h
>> +++ b/include/asm-generic/atomic-long.h
>> @@ -253,6 +253,6 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
>> #define atomic_long_xchg(v, new) \
>> (atomic_xchg((atomic_t *)(v), (new)))
>>
>> -#endif /* BITS_PER_LONG == 64 */
>> +#endif /* BITS_PER_LONG != 64 */
>>
>> #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
>

2014-07-22 22:17:09

by David Rientjes

Subject: Re: [PATCH] cleanup include/asm-generic/atomic.h

On Tue, 22 Jul 2014, Madhavan Srinivasan wrote:

> On Tuesday 22 July 2014 05:38 AM, David Rientjes wrote:
> > On Tue, 22 Jul 2014, Madhavan Srinivasan wrote:
> >
> >> Commit 4b358e2206 "cleanup include/asm-generic/atomic.h" added
> >> comments for #else/#endif, but ended up adding same comment
> >> "BITS_PER_LONG == 64" on both sides. This patch fixes it.
> >>
> >
> > It's intentionally like that, it comments the condition for which the
> > #endif is matched.
>
> Ok, will change the else comment. And include/asm-generic/local64.h
> also needs a change in comment.
>

The #else comment is fine, it's correct as written. The only use of these
comments is to identify for the reader the #ifdef for which it is matched
when there at least one nested #ifdef.