diff mbox

[1/1] alpha: Remove duplicate inclusion of asm/xchg.h

Message ID 1353323499-8638-1-git-send-email-sachin.kamat@linaro.org
State Rejected
Headers show

Commit Message

Sachin Kamat Nov. 19, 2012, 11:11 a.m. UTC
asm/xchg.h was included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 arch/alpha/include/asm/cmpxchg.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

Comments

Michael Cree Nov. 19, 2012, 6:30 p.m. UTC | #1
On Mon, Nov 19, 2012 at 04:41:39PM +0530, Sachin Kamat wrote:
> asm/xchg.h was included twice.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  arch/alpha/include/asm/cmpxchg.h |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/alpha/include/asm/cmpxchg.h b/arch/alpha/include/asm/cmpxchg.h
> index 429e8cd..8df1674 100644
> --- a/arch/alpha/include/asm/cmpxchg.h
> +++ b/arch/alpha/include/asm/cmpxchg.h
> @@ -40,7 +40,6 @@
>  #undef ____cmpxchg
>  #define ____xchg(type, args...)		__xchg ##type(args)
>  #define ____cmpxchg(type, args...)	__cmpxchg ##type(args)
> -#include <asm/xchg.h>

asm/xchg.h is intended to be included twice.  Your patch will break 
compilation.

Cheers
Michael.
Sachin Kamat Nov. 20, 2012, 3:24 a.m. UTC | #2
On 20 November 2012 00:00, Michael Cree <mcree@orcon.net.nz> wrote:
> On Mon, Nov 19, 2012 at 04:41:39PM +0530, Sachin Kamat wrote:
>> asm/xchg.h was included twice.
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> ---
>>  arch/alpha/include/asm/cmpxchg.h |    1 -
>>  1 files changed, 0 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/alpha/include/asm/cmpxchg.h b/arch/alpha/include/asm/cmpxchg.h
>> index 429e8cd..8df1674 100644
>> --- a/arch/alpha/include/asm/cmpxchg.h
>> +++ b/arch/alpha/include/asm/cmpxchg.h
>> @@ -40,7 +40,6 @@
>>  #undef ____cmpxchg
>>  #define ____xchg(type, args...)              __xchg ##type(args)
>>  #define ____cmpxchg(type, args...)   __cmpxchg ##type(args)
>> -#include <asm/xchg.h>
>
> asm/xchg.h is intended to be included twice.  Your patch will break
> compilation.

I did not realise it. I thought it was an unconditional include. Sorry
for the noise.

>
> Cheers
> Michael.
>
diff mbox

Patch

diff --git a/arch/alpha/include/asm/cmpxchg.h b/arch/alpha/include/asm/cmpxchg.h
index 429e8cd..8df1674 100644
--- a/arch/alpha/include/asm/cmpxchg.h
+++ b/arch/alpha/include/asm/cmpxchg.h
@@ -40,7 +40,6 @@ 
 #undef ____cmpxchg
 #define ____xchg(type, args...)		__xchg ##type(args)
 #define ____cmpxchg(type, args...)	__cmpxchg ##type(args)
-#include <asm/xchg.h>
 
 #define xchg(ptr, x)							\
 ({									\