x86/platform: Remove incorrect error message in x86_default_fixup_cpu_id()

It's only called from amd.c:srat_detect_node(). The introduced
condition for calling the fixup code is true for all AMD
multi-node processors, e.g. Magny-Cours and Interlagos. There we
have 2 NUMA nodes on one socket. Thus there are cores having
different numa-node-id but with equal phys_proc_id.

There is no point to print error messages in such a situation.

The confusing/misleading error message was introduced with
commit 64be4c1c24 ("x86: Add
x86_init platform override to fix up NUMA core numbering").

Remove the default fixup function (especially the error message)
and replace it by a NULL pointer check, move the
Numascale-specific condition for calling the fixup into the
fixup-function itself and slightly adapt the comment.

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Acked-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: <stable@kernel.org>
Cc: <sp@numascale.com>
Cc: <bp@amd64.org>
Cc: <daniel@numascale-asia.com>
Link: http://lkml.kernel.org/r/20120402160648.GR27684@alberich.amd.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

This commit is contained in:

Andreas Herrmann

2012-04-02 18:06:48 +02:00

committed by

Ingo Molnar

parent b1994304fc

commit 68894632af

5 changed files with 9 additions and 16 deletions

									
										arch/x86/include/asm/x86_init.h
									
		-1
	
												View File
												
				@@ -195,6 +195,5 @@ extern struct x86_msi_ops x86_msi;

				extern void x86_init_noop(void);

				extern void x86_init_uint_noop(unsigned int unused);

				extern void x86_default_fixup_cpu_id(struct cpuinfo_x86 *c, int node);

				#endif