| Message ID | 1414915813-2462-3-git-send-email-daniel@numascale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Sun, 2 Nov 2014, Daniel J Blueman wrote:
> Add safe function to check if Numachip is detected, to be used elsewhere.
I cannot find a use case for this. I guess this is a left over of the
earlier 2G change, right?
Thanks,
tglx
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/04/2014 03:45 AM, Thomas Gleixner wrote: > On Sun, 2 Nov 2014, Daniel J Blueman wrote: > >> Add safe function to check if Numachip is detected, to be used elsewhere. > > I cannot find a use case for this. I guess this is a left over of the > earlier 2G change, right? I left it in as it's common to apic_numachip.c and a Numachip2 patch series I'll present later. Daniel
On Tue, 4 Nov 2014, Daniel J Blueman wrote: > On 11/04/2014 03:45 AM, Thomas Gleixner wrote: > > On Sun, 2 Nov 2014, Daniel J Blueman wrote: > > > > > Add safe function to check if Numachip is detected, to be used elsewhere. > > > > I cannot find a use case for this. I guess this is a left over of the > > earlier 2G change, right? > > I left it in as it's common to apic_numachip.c and a Numachip2 patch series > I'll present later. Please move it to that series then. Thanks, tglx -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/include/asm/numachip/numachip.h b/arch/x86/include/asm/numachip/numachip.h index 1c6f7f6..3e1f4f9 100644 --- a/arch/x86/include/asm/numachip/numachip.h +++ b/arch/x86/include/asm/numachip/numachip.h @@ -16,4 +16,13 @@ extern int __init pci_numachip_init(void); +#ifdef CONFIG_X86_NUMACHIP +extern bool is_numachip_system(void); +#else +static inline bool is_numachip_system(void) +{ + return 0; +} +#endif + #endif /* _ASM_X86_NUMACHIP_NUMACHIP_H */ diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c index bd083c0..c965b69 100644 --- a/arch/x86/kernel/apic/apic_numachip.c +++ b/arch/x86/kernel/apic/apic_numachip.c @@ -30,7 +30,7 @@ #include <asm/apic_flat_64.h> #include <asm/pgtable.h> -static int numachip_system __read_mostly; +static bool numachip_system __read_mostly; static const struct apic apic_numachip __refconst; @@ -173,11 +173,16 @@ static void fixup_cpu_id(struct cpuinfo_x86 *c, int node) } } +bool is_numachip_system(void) +{ + return numachip_system; +} + static int __init numachip_system_init(void) { unsigned int val; - if (!numachip_system) + if (!is_numachip_system()) return 0; x86_cpuinit.fixup_cpu_id = fixup_cpu_id;
Add safe function to check if Numachip is detected, to be used elsewhere. Signed-off-by: Daniel J Blueman <daniel@numascale.com> --- arch/x86/include/asm/numachip/numachip.h | 9 +++++++++ arch/x86/kernel/apic/apic_numachip.c | 9 +++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)