Merge with Linux 2.3.38.

7 files changed, 47 insertions, 25 deletions

diff --git a/include/asm-i386/checksum.h b/include/asm-i386/checksum.h
index addaea876..6cd9c0992 100644
--- a/include/asm-i386/checksum.h
+++ b/include/asm-i386/checksum.h
@@ -48,24 +48,6 @@ unsigned int csum_partial_copy_from_user ( const char *src, char *dst,
 	return csum_partial_copy_generic ( src, dst, len, sum, err_ptr, NULL);
 }
 
-#if 0
-
-/* Not used at the moment. It is difficult to imagine for what purpose
-   it can be used :-) Please, do not forget to verify_area before it --ANK
- */
-
-/*
- * This combination is currently not used, but possible:
- */
-
-extern __inline__
-unsigned int csum_partial_copy_to_user ( const char *src, char *dst,
-					int len, int sum, int *err_ptr)
-{
-	return csum_partial_copy_generic ( src, dst, len, sum, NULL, err_ptr);
-}
-#endif
-
 /*
  * These are the old (and unsafe) way of doing checksums, a warning message will be
  * printed if they are used and an exeption occurs.
diff --git a/include/asm-i386/hw_irq.h b/include/asm-i386/hw_irq.h
index 0a2e01c36..84d73ee13 100644
--- a/include/asm-i386/hw_irq.h
+++ b/include/asm-i386/hw_irq.h
@@ -124,8 +124,8 @@ extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
 	"pushl %ecx\n\t" \
 	"pushl %ebx\n\t" \
 	"movl $" STR(__KERNEL_DS) ",%edx\n\t" \
-	"movl %dx,%ds\n\t" \
-	"movl %dx,%es\n\t"
+	"movl %edx,%ds\n\t" \
+	"movl %edx,%es\n\t"
 
 #define IRQ_NAME2(nr) nr##_interrupt(void)
 #define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr)
diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h
index c5e36bdf5..d6f199989 100644
--- a/include/asm-i386/page.h
+++ b/include/asm-i386/page.h
@@ -69,8 +69,8 @@ typedef struct { unsigned long pgprot; } pgprot_t;
  * a virtual address space of one gigabyte, which limits the
  * amount of physical memory you can use to about 950MB. 
  *
- * If you want more physical memory than this then see the CONFIG_BIGMEM
- * option in the kernel configuration.
+ * If you want more physical memory than this then see the CONFIG_HIGHMEM4G
+ * amd CONFIG_HIGHMEM64G options in the kernel configuration.
  */
 
 #define __PAGE_OFFSET		(0xC0000000)
diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h
index 878c637f7..242d8e3eb 100644
--- a/include/asm-i386/processor.h
+++ b/include/asm-i386/processor.h
@@ -413,6 +413,7 @@ unsigned long get_wchan(struct task_struct *p);
 #define THREAD_SIZE (2*PAGE_SIZE)
 #define alloc_task_struct() ((struct task_struct *) __get_free_pages(GFP_KERNEL,1))
 #define free_task_struct(p) free_pages((unsigned long) (p), 1)
+#define get_task_struct(tsk)      atomic_inc(&mem_map[MAP_NR(tsk)].count)
 
 #define init_task	(init_task_union.task)
 #define init_stack	(init_task_union.stack)
diff --git a/include/asm-i386/semaphore.h b/include/asm-i386/semaphore.h
index 3cdb0f6cd..ef4c558da 100644
--- a/include/asm-i386/semaphore.h
+++ b/include/asm-i386/semaphore.h
@@ -258,9 +258,9 @@ extern inline void init_rwsem(struct rw_semaphore *sem)
 }
 
 /* we use FASTCALL convention for the helpers */
-extern struct rw_semaphore *FASTCALL(down_read_failed(struct rw_semaphore *sem));
-extern struct rw_semaphore *FASTCALL(down_write_failed(struct rw_semaphore *sem));
-extern struct rw_semaphore *FASTCALL(rwsem_wake(struct rw_semaphore *sem));
+extern struct rw_semaphore *FASTCALL(__down_read_failed(struct rw_semaphore *sem));
+extern struct rw_semaphore *FASTCALL(__down_write_failed(struct rw_semaphore *sem));
+extern struct rw_semaphore *FASTCALL(__rwsem_wake(struct rw_semaphore *sem));
 
 extern inline void down_read(struct rw_semaphore *sem)
 {
diff --git a/include/asm-i386/stat.h b/include/asm-i386/stat.h
index 08132a76a..cb2fa6f4d 100644
--- a/include/asm-i386/stat.h
+++ b/include/asm-i386/stat.h
@@ -38,4 +38,40 @@ struct stat {
 	unsigned long  __unused5;
 };
 
+/* This matches struct stat64 in glibc2.1, hence the absolutely
+ * insane amounts of padding around dev_t's.
+ */
+struct stat64 {
+	unsigned short	st_dev;
+	unsigned char	__pad0[10];
+
+	unsigned long	st_ino;
+	unsigned int	st_mode;
+	unsigned int	st_nlink;
+
+	unsigned long	st_uid;
+	unsigned long	st_gid;
+
+	unsigned short	st_rdev;
+	unsigned char	__pad3[10];
+
+	long long	st_size;
+	unsigned long	st_blksize;
+
+	unsigned long	st_blocks;	/* Number 512-byte blocks allocated. */
+	unsigned long	__pad4;		/* future possible st_blocks high bits */
+
+	unsigned long	st_atime;
+	unsigned long	__pad5;
+
+	unsigned long	st_mtime;
+	unsigned long	__pad6;
+
+	unsigned long	st_ctime;
+	unsigned long	__pad7;		/* will be high 32 bits of ctime someday */
+
+	unsigned long	__unused1;
+	unsigned long	__unused2;
+};
+
 #endif
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 8678dc583..5ddbd7635 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -199,6 +199,9 @@
 #define __NR_mmap2		192
 #define __NR_truncate64		193
 #define __NR_ftruncate64	194
+#define __NR_stat64		195
+#define __NR_lstat64		196
+#define __NR_fstat64		197
 
 /* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */