v2.4.1.2 -> v2.4.1.3

  - Jens: better ordering of requests when unable to merge
  - Neil Brown: make md work as a module again (we cannot autodetect
  in modules, not enough background information)
  - Neil Brown: raid5 SMP locking cleanups
  - Neil Brown: nfsd: handle Irix NFS clients named pipe behavior and
  dentry leak fix
  - maestro3 shutdown fix
  - fix dcache hash calculation that could cause bad hashes under certain
  circumstances (Dean Gaudet)
  - David Miller: networking and sparc updates
  - Jeff Garzik: include file cleanups
  - Andy Grover: ACPI update
  - Coda-fs error return fixes
  - rth: alpha Jensen update

7 files changed, 12 insertions, 9 deletions

diff --git a/kernel/acct.c b/kernel/acct.c
index e2e8826fa6fd..a836dd1a6f7a 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -53,6 +53,7 @@
 #include <linux/acct.h>
 #include <linux/smp_lock.h>
 #include <linux/file.h>
+#include <linux/tty.h>
 
 #include <asm/uaccess.h>
 
diff --git a/kernel/exit.c b/kernel/exit.c
index c747f547b182..73db5d094acd 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -5,10 +5,11 @@
  */
 
 #include <linux/config.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/smp_lock.h>
 #include <linux/module.h>
+#include <linux/tty.h>
 #ifdef CONFIG_BSD_PROCESS_ACCT
 #include <linux/acct.h>
 #endif
diff --git a/kernel/fork.c b/kernel/fork.c
index e578a9644379..6f0582cbf44b 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -12,7 +12,7 @@
  */
 
 #include <linux/config.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/unistd.h>
 #include <linux/smp_lock.h>
diff --git a/kernel/ksyms.c b/kernel/ksyms.c
index f362615000f5..ca9001dbeaed 100644
--- a/kernel/ksyms.c
+++ b/kernel/ksyms.c
@@ -10,7 +10,7 @@
  */
 
 #include <linux/config.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/blkdev.h>
 #include <linux/cdrom.h>
@@ -45,6 +45,7 @@
 #include <linux/highuid.h>
 #include <linux/brlock.h>
 #include <linux/fs.h>
+#include <linux/tty.h>
 
 #if defined(CONFIG_PROC_FS)
 #include <linux/proc_fs.h>
diff --git a/kernel/resource.c b/kernel/resource.c
index b553eb0ff2e9..11736887486d 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -11,7 +11,7 @@
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <asm/io.h>
 
diff --git a/kernel/sched.c b/kernel/sched.c
index 1df69dab41b4..b6f6c879a1a4 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1115,11 +1115,11 @@ static void show_task(struct task_struct * p)
 	else
 		printk("\n");
 
-#ifdef CONFIG_X86
-/* This is very useful, but only works on x86 right now */
+#if defined(CONFIG_X86) || defined(CONFIG_SPARC64)
+/* This is very useful, but only works on x86 and sparc64 right now */
 	{
-		extern void show_trace(unsigned long);
-		show_trace(p->thread.esp);
+		extern void show_trace_task(struct task_struct *tsk);
+		show_trace_task(p);
 	}
 #endif
 }
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 95fc9e9fb7bc..96f46ecb7727 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -19,7 +19,7 @@
  */
 
 #include <linux/config.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/sysctl.h>
 #include <linux/swapctl.h>
 #include <linux/proc_fs.h>