On 12/6/2011 06:50, Ingo Molnar wrote:
* Steffen Persvold<sp@xxxxxxxxxxxxx> wrote:On 12/5/2011 21:31, Ingo Molnar wrote: []There's a new build failure caused by this commit:It's this commit actually : Commit-ID: 64be4c1c2428e148de6081af235e2418e6a66dda Gitweb: http://git.kernel.org/tip/64be4c1c2428e148de6081af235e2418e6a66dda Author: Daniel J Blueman<daniel@xxxxxxxxxxxxxxxxxx> AuthorDate: Mon, 5 Dec 2011 16:20:37 +0800 Committer: Ingo Molnar<mingo@xxxxxxx> CommitDate: Mon, 5 Dec 2011 17:17:21 +0100 x86: Add x86_init platform override to fix up NUMA core numberingarch/x86/kernel/cpu/common.c:1149:2: error: ‘struct cpuinfo_x86’ has no member named ‘phys_proc_id’ Note that the config is a !SMP one - that's probably the key detail.Yes, phys_proc_id in struct cpuinfo_x86 is covered within "ifdef CONFIG_SMP".Please send a delta fix that resolves this bug. You can find the current lineup in: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitWill do, should be fairly simple. Something in the lines of the attached should work (tested). Note: I used "ifdef CONFIG_NUMA" simply because it doesn't make sense in a non-numa configuration even with SMP enabled. Besides, the only place where it is called right now is in kernel/cpu/amd.c:srat_detect_node() within the "CONFIG_NUMA" protected part. Cheers, -- Steffen Persvold, Chief Architect NumaChip Numascale AS - www.numascale.com Tel: +47 92 49 25 54 Skype: spersvolddiff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index ad4da45..a70bd5b 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1146,7 +1146,9 @@ static void dbg_restore_debug_regs(void) */ void __cpuinit x86_default_fixup_cpu_id(struct cpuinfo_x86 *c, int node) { +#ifdef CONFIG_NUMA pr_err("NUMA core number %d differs from configured core number %d\n", node, c->phys_proc_id); +#endif }Yep, this should do the trick - i'll need a Signed-off-by line to apply it.
Signed-off-by: Steffen Persvold <sp@xxxxxxxxxxxxx> Cheers, -- Steffen Persvold, Chief Architect NumaChip Numascale AS - www.numascale.com Tel: +47 92 49 25 54 Skype: spersvold -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html