Merge

arch/ia64/Kconfig

@@ -78,15 +78,6 @@ config IA64_HP_SIM
 
 endchoice
 
-config HOTPLUG_CPU
-    bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
-    depends on SMP && HOTPLUG && EXPERIMENTAL
-	default n
-    ---help---
-      Say Y here to experiment with turning CPUs off and on.  CPUs
-      can be controlled through /sys/devices/system/cpu/cpu#.
-      Say N if you want to disable cpu hotplug.
-
 choice
 	prompt "Processor type"
 	default ITANIUM
@@ -253,6 +244,15 @@ config NR_CPUS
 	  than 64 will cause the use of a CPU mask array, causing a small
 	  performance hit.
 
+config HOTPLUG_CPU
+    bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
+    depends on SMP && HOTPLUG && EXPERIMENTAL
+	default n
+    ---help---
+      Say Y here to experiment with turning CPUs off and on.  CPUs
+      can be controlled through /sys/devices/system/cpu/cpu#.
+      Say N if you want to disable CPU hotplug.
+
 config PREEMPT
 	bool "Preemptible Kernel"
         help

arch/ia64/sn/io/machvec/iomv.c

@@ -71,6 +71,6 @@ sn_mmiob (void)
 {
 	while ((((volatile unsigned long) (*pda->pio_write_status_addr)) & SH_PIO_WRITE_STATUS_0_PENDING_WRITE_COUNT_MASK) != 
 				SH_PIO_WRITE_STATUS_0_PENDING_WRITE_COUNT_MASK)
-		udelay(1);
+		cpu_relax();
 }
 EXPORT_SYMBOL(sn_mmiob);

include/asm-ia64/unistd.h

@@ -258,6 +258,7 @@
 #define __NR_mq_notify			1266
 #define __NR_mq_getsetattr		1267
 #define __NR_kexec_load			1268
+#define __NR_vserver			1269
 
 #ifdef __KERNEL__