ia64: Minor cleanups; fix non-SMP build.

arch/ia64/Kconfig

@@ -818,7 +818,7 @@ config IA64_EARLY_PRINTK_VGA
 
 config IA64_EARLY_PRINTK_SGI_SN
 	bool "Early printk on SGI SN serial console"
-	depends on IA64_EARLY_PRINTK
+	depends on IA64_EARLY_PRINTK && (IA64_GENERIC || IA64_SGI_SN2)
 
 config DEBUG_SLAB
 	bool "Debug memory allocations"

include/asm-ia64/thread_info.h

@@ -37,7 +37,6 @@ struct thread_info {
 	struct restart_block restart_block;
 };
 
-#define INIT_THREAD_SIZE		/* tell sched.h not to declare the thread_union */
 #define THREAD_SIZE			KERNEL_STACK_SIZE
 
 #define INIT_THREAD_INFO(tsk)			\

include/asm-ia64/topology.h

@@ -28,11 +28,6 @@
  */
 #define node_to_cpumask(node) (node_to_cpu_mask[node])
 
-#else
-#define cpu_to_node(cpu) (0)
-#define node_to_cpumask(node) (phys_cpu_present_map)
-#endif
-
 /*
  * Returns the number of the node containing MemBlk 'memblk'
  */
@@ -65,4 +60,8 @@
 
 void build_cpu_to_node_map(void);
 
+#endif /* CONFIG_NUMA */
+
+#include <asm-generic/topology.h>
+
 #endif /* _ASM_IA64_TOPOLOGY_H */