Merge http://lia64.bkbits.net/to-linus-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

arch/ia64/kernel/signal.c

@@ -559,10 +559,12 @@ ia64_do_signal (sigset_t *oldset, struct sigscratch *scr, long in_syscall)
 
 		ka = &current->sighand->action[signr - 1];
 
+		/* Always make any pending restarted system calls return -EINTR */
+		current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
 		if (restart) {
 			switch (errno) {
 			      case ERESTART_RESTARTBLOCK:
-				current_thread_info()->restart_block.fn = do_no_restart_syscall;
 			      case ERESTARTNOHAND:
 				scr->pt.r8 = ERR_CODE(EINTR);
 				/* note: scr->pt.r10 is already -1 */

include/asm-ia64/sn/nodepda.h

@@ -128,7 +128,7 @@ typedef struct irqpda_s irqpda_t;
  * Check if given a compact node id the corresponding node has all the
  * cpus disabled. 
  */
-#define is_headless_node(cnode)		(!node_to_cpu_mask[cnode])
+#define is_headless_node(cnode)		(nr_cpus_node(cnode) == 0)
 
 /*
  * Check if given a node vertex handle the corresponding node has all the