ia64: Finish 2.5.52+ merge.

arch/ia64/Makefile

@@ -24,12 +24,13 @@ CFLAGS_KERNEL	:= -mconstant-gp
 GCC_VERSION=$(shell $(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
 
 ifneq ($(GCC_VERSION),2)
-	CFLAGS += -frename-registers --param max-inline-insns=5000
+	cflags-y += -frename-registers --param max-inline-insns=5000
 endif
 
 cflags-$(CONFIG_ITANIUM_BSTEP_SPECIFIC)	+= -mb-step
 cflags-$(CONFIG_IA64_SGI_SN)		+= -DBRINGUP
 
+CFLAGS += $(cflags-y)
 HEAD := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o
 
 libs-y				+= arch/ia64/lib/

arch/ia64/kernel/setup.c

@@ -364,11 +364,13 @@ setup_arch (char **cmdline_p)
 #ifdef CONFIG_ACPI_BOOT
 	/* Initialize the ACPI boot-time table parser */
 	acpi_table_init(*cmdline_p);
-
-#ifdef CONFIG_ACPI_NUMA
+# ifdef CONFIG_ACPI_NUMA
 	acpi_numa_init();
-#endif
-
+# endif
+#else
+# ifdef CONFIG_SMP
+	smp_build_cpu_map();	/* happens, e.g., with the Ski simulator */
+# endif
 #endif /* CONFIG_APCI_BOOT */
 
 	find_memory();
@@ -501,6 +503,7 @@ show_cpuinfo (struct seq_file *m, void *v)
 			sep = ',';
 			*cp++ = ' ';
 			strcpy(cp, feature_bits[i].feature_name);
+			cp += strlen(feature_bits[i].feature_name);
 			mask &= ~feature_bits[i].mask;
 		}
 	}

arch/ia64/kernel/signal.c

@@ -527,7 +527,6 @@ ia64_do_signal (sigset_t *oldset, struct sigscratch *scr, long in_syscall)
 		if (restart) {
 			switch (errno) {
 			      case ERESTART_RESTARTBLOCK:
-printk("ERESTART_RESTARTBLOCK: ignoring\n");
 				current_thread_info()->restart_block.fn = do_no_restart_syscall;
 			      case ERESTARTNOHAND:
 				scr->pt.r8 = ERR_CODE(EINTR);
@@ -577,12 +576,10 @@ printk("ERESTART_RESTARTBLOCK: ignoring\n");
 				 * the "break" instruction gets re-executed.
 				 */
 				ia64_decrement_ip(&scr->pt);
-				if (errno == ERESTART_RESTARTBLOCK) {
-printk("ERESTART_RESTARTBLOCK: restarting at %lx\n", scr->pt.cr_iip);
+				if (errno == ERESTART_RESTARTBLOCK)
 					scr->pt.r15 = __NR_restart_syscall;
 			}
 		}
 	}
-	}
 	return 0;
 }