- Delete duplicate SN2 definition of cpu_logical_id for non-SMP

Looks like this patch is needed to build non-SMP configurations.

Delete duplicate / stale definition of cpu_logical_id for non-SMP configurations.

Index: linux/include/asm-ia64/sn/sn_cpuid.h
=================================--- linux.orig/include/asm-ia64/sn/sn_cpuid.h 2005-01-03 19:55:30.048998168 -0600
+++ linux/include/asm-ia64/sn/sn_cpuid.h 2005-01-06 15:50:15.335369557 -0600
@@ -82,7 +82,6 @@
*/

#ifndef CONFIG_SMP
-#define cpu_logical_id(cpu) 0
#define cpu_physical_id(cpuid) ((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
#endif

Thanks

Jack Steiner ([email protected])          651-683-5302
Principal Engineer                      SGI - Silicon Graphics, Inc.

I think a lot more than that is needed to fix the UP build. The patch Dann posted contains this hunk and several others (also move the physical_id macro out to a generic file).

Jesse