MIPS: Fix sparse CPU id space build error.
diff mbox

Message ID -
State Not Applicable
Delegated to: James Hogan
Headers show

Commit Message

Steven J. Hill Oct. 2, 2017, 5:39 p.m. UTC 
From: "Steven J. Hill" <>

Patch "MIPS: Allow __cpu_number_map to be larger than NR_CPUS" was
incomplete, thus breaking all MIPS builds.

Signed-off-by: Steven J. Hill <>
---
 arch/mips/Kconfig | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Florian Fainelli Oct. 3, 2017, 4:05 a.m. UTC | #1 
On 10/02/2017 10:39 AM, Steven J. Hill wrote:
> From: "Steven J. Hill" <>
> 
> Patch "MIPS: Allow __cpu_number_map to be larger than NR_CPUS" was
> incomplete, thus breaking all MIPS builds.

Did not you submit a corrected version as part of [PATCH v2 00/12] Add
Octeon Hotplug CPU Support.? Was v1 already merged?

> 
> Signed-off-by: Steven J. Hill <>
> ---
>  arch/mips/Kconfig | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index 87ed0ff..da74db1 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -2726,6 +2726,14 @@ config NR_CPUS
>  config MIPS_PERF_SHARED_TC_COUNTERS
>  	bool
>  
> +config MIPS_NR_CPU_NR_MAP_1024
> +	bool
> +
> +config MIPS_NR_CPU_NR_MAP
> +	int
> +	default 1024 if MIPS_NR_CPU_NR_MAP_1024
> +	default NR_CPUS if !MIPS_NR_CPU_NR_MAP_1024
> +
>  #
>  # Timer Interrupt Frequency Configuration
>  #
>
Steven J. Hill Oct. 3, 2017, 3:53 p.m. UTC | #2 
On 10/02/2017 11:05 PM, Florian Fainelli wrote:
>>
>> Patch "MIPS: Allow __cpu_number_map to be larger than NR_CPUS" was
>> incomplete, thus breaking all MIPS builds.
> 
> Did not you submit a corrected version as part of [PATCH v2 00/12] Add
> Octeon Hotplug CPU Support.? Was v1 already merged?
> 
Yes, I did. However, Ralf had already pushed the broken v1 patch
upstream. Timing jitter of patches.  ¯\_(ツ)_/¯
Florian Fainelli Oct. 3, 2017, 5 p.m. UTC | #3 
On 10/03/2017 08:53 AM, Steven J. Hill wrote:
> On 10/02/2017 11:05 PM, Florian Fainelli wrote:
>>>
>>> Patch "MIPS: Allow __cpu_number_map to be larger than NR_CPUS" was
>>> incomplete, thus breaking all MIPS builds.
>>
>> Did not you submit a corrected version as part of [PATCH v2 00/12] Add
>> Octeon Hotplug CPU Support.? Was v1 already merged?
>>
> Yes, I did. However, Ralf had already pushed the broken v1 patch
> upstream. Timing jitter of patches.  ¯\_(ツ)_/¯

Ralf, did not you have a post-receive hook set-up that emails people
when you apply their patches at some point?

Patch
diff mbox 

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 87ed0ff..da74db1 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2726,6 +2726,14 @@  config NR_CPUS
 config MIPS_PERF_SHARED_TC_COUNTERS
 	bool
 
+config MIPS_NR_CPU_NR_MAP_1024
+	bool
+
+config MIPS_NR_CPU_NR_MAP
+	int
+	default 1024 if MIPS_NR_CPU_NR_MAP_1024
+	default NR_CPUS if !MIPS_NR_CPU_NR_MAP_1024
+
 #
 # Timer Interrupt Frequency Configuration
 #