[PATCH] mips:Remove unneeded duplicate declaration of cpu_callin_map in smp.h

[PATCH] mips:Remove unneeded duplicate declaration of cpu_callin_map in smp.h

[Nicholas Krause]

This removes the unneeded duplicate declaration of cpu_callin_map
in smp.h due to use already declaring it in the file,smp.c that
already uses it internally for functions required this variable
for their various internal work.

Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
 arch/mips/include/asm/smp.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h
index bb02fac..7752011 100644
--- a/arch/mips/include/asm/smp.h
+++ b/arch/mips/include/asm/smp.h
@@ -45,8 +45,6 @@ extern int __cpu_logical_map[NR_CPUS];
 #define SMP_DUMP		0x8
 #define SMP_ASK_C0COUNT		0x10
 
-extern volatile cpumask_t cpu_callin_map;
-
 /* Mask of CPUs which are currently definitely operating coherently */
 extern cpumask_t cpu_coherent_mask;
 
-- 
2.1.4

Re: [PATCH] mips:Remove unneeded duplicate declaration of cpu_callin_map in smp.h

[James Hogan]

[-- Attachment #1: Type: text/plain, Size: 1399 bytes --]

On 08/05/15 15:12, Nicholas Krause wrote:
> This removes the unneeded duplicate declaration of cpu_callin_map
> in smp.h due to use already declaring it in the file,smp.c that

No, it isn't declared in arch/mips/kernel/smp.c, its *defined* there (no
"extern"). It's referenced by:
arch/mips/cavium-octeon/smp.c
arch/mips/kernel/process.c
arch/mips/kernel/smp-bmips.c
arch/mips/kernel/smp-cps.c
arch/mips/loongson/loongson-3/smp.c
as well as arch/mips/kernel/smp.c, which is why the declaration is
needed in a header.

If you're attempting to fix the build errors in this area, please see:
http://patchwork.linux-mips.org/patch/9970/

Cheers
James

> already uses it internally for functions required this variable
> for their various internal work.
> 
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
>  arch/mips/include/asm/smp.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h
> index bb02fac..7752011 100644
> --- a/arch/mips/include/asm/smp.h
> +++ b/arch/mips/include/asm/smp.h
> @@ -45,8 +45,6 @@ extern int __cpu_logical_map[NR_CPUS];
>  #define SMP_DUMP		0x8
>  #define SMP_ASK_C0COUNT		0x10
>  
> -extern volatile cpumask_t cpu_callin_map;
> -
>  /* Mask of CPUs which are currently definitely operating coherently */
>  extern cpumask_t cpu_coherent_mask;
>  
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] mips:Remove unneeded duplicate declaration of cpu_callin_map in smp.h

[James Hogan]

[-- Attachment #1: Type: text/plain, Size: 1399 bytes --]

On 08/05/15 15:12, Nicholas Krause wrote:
> This removes the unneeded duplicate declaration of cpu_callin_map
> in smp.h due to use already declaring it in the file,smp.c that

No, it isn't declared in arch/mips/kernel/smp.c, its *defined* there (no
"extern"). It's referenced by:
arch/mips/cavium-octeon/smp.c
arch/mips/kernel/process.c
arch/mips/kernel/smp-bmips.c
arch/mips/kernel/smp-cps.c
arch/mips/loongson/loongson-3/smp.c
as well as arch/mips/kernel/smp.c, which is why the declaration is
needed in a header.

If you're attempting to fix the build errors in this area, please see:
http://patchwork.linux-mips.org/patch/9970/

Cheers
James

> already uses it internally for functions required this variable
> for their various internal work.
> 
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
>  arch/mips/include/asm/smp.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h
> index bb02fac..7752011 100644
> --- a/arch/mips/include/asm/smp.h
> +++ b/arch/mips/include/asm/smp.h
> @@ -45,8 +45,6 @@ extern int __cpu_logical_map[NR_CPUS];
>  #define SMP_DUMP		0x8
>  #define SMP_ASK_C0COUNT		0x10
>  
> -extern volatile cpumask_t cpu_callin_map;
> -
>  /* Mask of CPUs which are currently definitely operating coherently */
>  extern cpumask_t cpu_coherent_mask;
>  
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] mips:Remove unneeded duplicate declaration of cpu_callin_map in smp.h

[nick]

On 2015-05-08 10:51 AM, James Hogan wrote:
> On 08/05/15 15:12, Nicholas Krause wrote:
>> This removes the unneeded duplicate declaration of cpu_callin_map
>> in smp.h due to use already declaring it in the file,smp.c that
> 
> No, it isn't declared in arch/mips/kernel/smp.c, its *defined* there (no
> "extern"). It's referenced by:
> arch/mips/cavium-octeon/smp.c
> arch/mips/kernel/process.c
> arch/mips/kernel/smp-bmips.c
> arch/mips/kernel/smp-cps.c
> arch/mips/loongson/loongson-3/smp.c
> as well as arch/mips/kernel/smp.c, which is why the declaration is
> needed in a header.
> 
> If you're attempting to fix the build errors in this area, please see:
> http://patchwork.linux-mips.org/patch/9970/
> 
> Cheers
> James
> 
>> already uses it internally for functions required this variable
>> for their various internal work.
>>
>> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
>> ---
>>  arch/mips/include/asm/smp.h | 2 --
>>  1 file changed, 2 deletions(-)
>>
>> diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h
>> index bb02fac..7752011 100644
>> --- a/arch/mips/include/asm/smp.h
>> +++ b/arch/mips/include/asm/smp.h
>> @@ -45,8 +45,6 @@ extern int __cpu_logical_map[NR_CPUS];
>>  #define SMP_DUMP		0x8
>>  #define SMP_ASK_C0COUNT		0x10
>>  
>> -extern volatile cpumask_t cpu_callin_map;
>> -
>>  /* Mask of CPUs which are currently definitely operating coherently */
>>  extern cpumask_t cpu_coherent_mask;
>>  
>>
> James,
Your patch is 100% percent I missed that it hit all those files and therefore just removed it from the 
header file. After looking at it further this was easy break the build on other configurations,please
NAK this patch.
Nick