Merge wailua.hpl.hp.com:/bk/vanilla/linux-2.5

into wailua.hpl.hp.com:/bk/lia64/to-linus-2.5

arch/ia64/config.in

@@ -136,6 +136,17 @@ else
 fi
 endmenu
 
+else # ! HP_SIM
+mainmenu_option next_comment
+comment 'Block devices'
+tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
+dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET
+
+tristate 'RAM disk support' CONFIG_BLK_DEV_RAM
+if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then
+   int '  Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 4096
+fi
+endmenu
 fi # !HP_SIM
 
 mainmenu_option next_comment

arch/ia64/kernel/entry.S

@@ -486,6 +486,7 @@ END(ia64_trace_syscall)
 
 GLOBAL_ENTRY(ia64_ret_from_clone)
 	PT_REGS_UNWIND_INFO(0)
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
 	/*
 	 * We need to call schedule_tail() to complete the scheduling process.
 	 * Called by ia64_switch_to after do_fork()->copy_thread().  r8 contains the
@@ -493,6 +494,7 @@ GLOBAL_ENTRY(ia64_ret_from_clone)
 	 */
 	br.call.sptk.many rp=ia64_invoke_schedule_tail
 .ret8:
+#endif
 	adds r2=TI_FLAGS+IA64_TASK_SIZE,r13
 	;;
 	ld4 r2=[r2]

arch/ia64/kernel/smp.c

@@ -75,12 +75,8 @@ struct call_data_struct {
 
 static volatile struct call_data_struct *call_data;
 
-static spinlock_t migration_lock = SPIN_LOCK_UNLOCKED;
-static task_t *migrating_task;
-
 #define IPI_CALL_FUNC		0
 #define IPI_CPU_STOP		1
-#define IPI_MIGRATE_TASK	2
 
 static void
 stop_this_cpu (void)
@@ -143,14 +139,6 @@ handle_IPI (int irq, void *dev_id, struct pt_regs *regs)
 			      }
 			      break;
 
-			      case IPI_MIGRATE_TASK:
-			      {
-				      task_t *p = migrating_task;
-				      spin_unlock(&migration_lock);
-				      sched_task_migrated(p);
-			      }
-			      break;
-
 			      case IPI_CPU_STOP:
 				stop_this_cpu();
 				break;
@@ -350,15 +338,6 @@ smp_send_stop (void)
 	smp_num_cpus = 1;
 }
 
-void
-smp_migrate_task (int cpu, task_t *p)
-{
-	/* The target CPU will unlock the migration spinlock: */
-	spin_lock(&migration_lock);
-	migrating_task = p;
-	send_IPI_single(cpu, IPI_MIGRATE_TASK);
-}
-
 int __init
 setup_profiling_timer (unsigned int multiplier)
 {

arch/ia64/lib/clear_page.S

@@ -18,7 +18,7 @@
 # define PREFETCH_LINES	9	// magic number
 #else
 # define L3_LINE_SIZE	128	// McKinley L3 line size
-# define PREFETCH_LINES	7	// magic number
+# define PREFETCH_LINES	12	// magic number
 #endif
 
 #define saved_lc	r2

arch/ia64/mm/init.c

@@ -103,12 +103,12 @@ free_initmem (void)
 		free_page(addr);
 		++totalram_pages;
 	}
-	printk ("Freeing unused kernel memory: %ldkB freed\n",
-		(&__init_end - &__init_begin) >> 10);
+	printk(KERN_INFO "Freeing unused kernel memory: %ldkB freed\n",
+	       (&__init_end - &__init_begin) >> 10);
 }
 
 void
-free_initrd_mem(unsigned long start, unsigned long end)
+free_initrd_mem (unsigned long start, unsigned long end)
 {
 	/*
 	 * EFI uses 4KB pages while the kernel can use 4KB  or bigger.
@@ -145,7 +145,7 @@ free_initrd_mem(unsigned long start, unsigned long end)
 	end = end & PAGE_MASK;
 
 	if (start < end)
-		printk ("Freeing initrd memory: %ldkB freed\n", (end - start) >> 10);
+		printk(KERN_INFO "Freeing initrd memory: %ldkB freed\n", (end - start) >> 10);
 
 	for (; start < end; start += PAGE_SIZE) {
 		if (!VALID_PAGE(virt_to_page(start)))
@@ -445,4 +445,4 @@ mem_init (void)
 #ifdef CONFIG_IA32_SUPPORT
 	ia32_gdt_init();
 #endif
-}
+}
\ No newline at end of file

arch/ia64/vmlinux.lds.S

@@ -91,6 +91,11 @@ SECTIONS
   .opd : AT(ADDR(.opd) - PAGE_OFFSET)
 	{ *(.opd) }
 
+  /* Per-cpu data: */
+  __per_cpu_start = .;
+  .data.percpu  : { *(.data.percpu) }
+  __per_cpu_end = .;
+
   /* Initialization code and data: */
 
   . = ALIGN(PAGE_SIZE);

include/asm-ia64/hardirq.h

@@ -2,8 +2,8 @@
 #define _ASM_IA64_HARDIRQ_H
 
 /*
- * Copyright (C) 1998-2001 Hewlett-Packard Co
- * Copyright (C) 1998-2001 David Mosberger-Tang <davidm@hpl.hp.com>
+ * Copyright (C) 1998-2002 Hewlett-Packard Co
+ *	David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
 #include <linux/config.h>

include/asm-ia64/siginfo.h

@@ -136,6 +136,7 @@ typedef struct siginfo {
 #define SI_ASYNCIO	(-4)		/* sent by AIO completion */
 #define SI_SIGIO	(-5)		/* sent by queued SIGIO */
 #define SI_TKILL	(-6)		/* sent by tkill system call */
+#define SI_DETHREAD	(-7)		/* sent by execve() killing subsidiary threads */
 
 #define SI_FROMUSER(siptr)	((siptr)->si_code <= 0)
 #define SI_FROMKERNEL(siptr)	((siptr)->si_code > 0)