Merge conectiva.com.br:/home/BK/includes-2.5.old

into conectiva.com.br:/home/BK/includes-2.5

10 files changed, 19 insertions, 1 deletions

diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index dddba9713e9b..70934edf7dd0 100644
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -21,6 +21,9 @@
 
 #include <linux/parport.h>
 #include <linux/delay.h>
+#include <linux/sched.h>
+
+#include <asm/current.h>
 #include <asm/uaccess.h>
 
 #define DEBUG /* undef me for production */
diff --git a/drivers/parport/ieee1284_ops.c b/drivers/parport/ieee1284_ops.c
index 23263479e1ae..838dee5ee5c1 100644
--- a/drivers/parport/ieee1284_ops.c
+++ b/drivers/parport/ieee1284_ops.c
@@ -17,6 +17,7 @@
 #include <linux/config.h>
 #include <linux/parport.h>
 #include <linux/delay.h>
+#include <linux/sched.h>
 #include <asm/uaccess.h>
 
 #undef DEBUG /* undef me for production */
diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h
index 67365387c9ae..412e4dcb9e40 100644
--- a/fs/autofs/autofs_i.h
+++ b/fs/autofs/autofs_i.h
@@ -26,6 +26,9 @@
 #include <linux/dcache.h>
 #include <linux/namei.h>
 #include <linux/mount.h>
+#include <linux/sched.h>
+
+#include <asm/current.h>
 #include <asm/uaccess.h>
 
 #ifdef DEBUG
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
index 8be225bb69ef..16a3ab2f6d05 100644
--- a/fs/autofs4/autofs_i.h
+++ b/fs/autofs4/autofs_i.h
@@ -24,6 +24,8 @@
 #include <linux/time.h>
 #include <linux/string.h>
 #include <linux/wait.h>
+#include <linux/sched.h>
+#include <asm/current.h>
 #include <asm/uaccess.h>
 
 /* #define DEBUG */
diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c
index bc96d74b9b46..afff8566f3b6 100644
--- a/fs/ext2/ioctl.c
+++ b/fs/ext2/ioctl.c
@@ -9,6 +9,8 @@
 
 #include "ext2.h"
 #include <linux/time.h>
+#include <linux/sched.h>
+#include <asm/current.h>
 #include <asm/uaccess.h>
 
 
diff --git a/include/asm-i386/desc.h b/include/asm-i386/desc.h
index 1c2ef24540e7..77f2b1c0ec46 100644
--- a/include/asm-i386/desc.h
+++ b/include/asm-i386/desc.h
@@ -6,6 +6,9 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/preempt.h>
+#include <linux/smp.h>
+
 #include <asm/mmu.h>
 
 extern struct desc_struct cpu_gdt_table[NR_CPUS][GDT_ENTRIES];
diff --git a/include/asm-i386/mmu.h b/include/asm-i386/mmu.h
index 86d1064f6988..f431a0b86d4c 100644
--- a/include/asm-i386/mmu.h
+++ b/include/asm-i386/mmu.h
@@ -1,6 +1,7 @@
 #ifndef __i386_MMU_H
 #define __i386_MMU_H
 
+#include <asm/semaphore.h>
 /*
  * The i386 doesn't have a mmu context, but
  * we put the segment information here.
diff --git a/include/asm-i386/uaccess.h b/include/asm-i386/uaccess.h
index 15d367991bf8..05bdac770eed 100644
--- a/include/asm-i386/uaccess.h
+++ b/include/asm-i386/uaccess.h
@@ -6,7 +6,7 @@
  */
 #include <linux/config.h>
 #include <linux/errno.h>
-#include <linux/sched.h>
+#include <linux/thread_info.h>
 #include <linux/prefetch.h>
 #include <asm/page.h>
 
diff --git a/ipc/msg.c b/ipc/msg.c
index 3df7cd96955a..f4c494e3c93b 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -23,6 +23,8 @@
 #include <linux/proc_fs.h>
 #include <linux/list.h>
 #include <linux/security.h>
+#include <linux/sched.h>
+#include <asm/current.h>
 #include <asm/uaccess.h>
 #include "util.h"
 
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index 6dc5782259b5..d5c8034b50a3 100644
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -186,6 +186,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/interrupt.h>
 #include <linux/spinlock.h>
 
 #include "sound_config.h"