diff -Naur -X exclude-files ac_cur/arch/um/defconfig ac/arch/um/defconfig
--- ac_cur/arch/um/defconfig	Thu Jun 14 17:47:37 2001
+++ ac/arch/um/defconfig	Thu Jun 14 17:53:15 2001
@@ -2,9 +2,11 @@
 # Automatically generated make config: don't edit
 #
 CONFIG_USERMODE=y
-CONFIG_ISA=y
+# CONFIG_ISA is not set
 # CONFIG_SBUS is not set
+# CONFIG_PCI is not set
 CONFIG_UID16=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 
 #
 # Code maturity level options
@@ -12,13 +14,9 @@
 CONFIG_EXPERIMENTAL=y
 
 #
-# Processor features
-#
-# CONFIG_SMP is not set
-
-#
 # General Setup
 #
+# CONFIG_SMP is not set
 CONFIG_STDIO_CONSOLE=y
 CONFIG_MODULES=y
 CONFIG_NET=y
@@ -42,7 +40,7 @@
 CONFIG_BLK_DEV_NBD=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
-# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_INITRD=y
 
 #
 # Networking options
@@ -88,7 +86,6 @@
 #
 # Network device support
 #
-
 CONFIG_UML_NET=y
 CONFIG_NET_ETHERTAP=y
 CONFIG_NET_DAEMON=y
@@ -104,6 +101,7 @@
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_ADFS_FS is not set
+# CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
@@ -114,11 +112,14 @@
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS_FS is not set
 # CONFIG_CRAMFS is not set
+# CONFIG_TMPFS is not set
 # CONFIG_RAMFS is not set
 CONFIG_ISO9660_FS=m
 # CONFIG_JOLIET is not set
 CONFIG_MINIX_FS=m
+# CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 CONFIG_DEVFS_FS=y
@@ -126,22 +127,37 @@
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX4FS_RW is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_EXT2_FS=y
 # CONFIG_SYSV_FS is not set
+# CONFIG_SYSV_FS_WRITE is not set
 # CONFIG_UDF_FS is not set
+# CONFIG_UDF_RW is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_UFS_FS_WRITE is not set
 
 #
 # Network File Systems
 #
 # CONFIG_CODA_FS is not set
 # CONFIG_NFS_FS is not set
+# CONFIG_NFS_V3 is not set
+# CONFIG_ROOT_NFS is not set
 # CONFIG_NFSD is not set
+# CONFIG_NFSD_V3 is not set
 # CONFIG_SUNRPC is not set
 # CONFIG_LOCKD is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_NCP_FS is not set
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+# CONFIG_NCPFS_NFS_NS is not set
+# CONFIG_NCPFS_OS2_NS is not set
+# CONFIG_NCPFS_SMALLDOS is not set
+# CONFIG_NCPFS_NLS is not set
+# CONFIG_NCPFS_EXTRAS is not set
 
 #
 # Partition Types
@@ -170,11 +186,13 @@
 # CONFIG_NLS_CODEPAGE_865 is not set
 # CONFIG_NLS_CODEPAGE_866 is not set
 # CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
 # CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
 # CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
 # CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
@@ -182,11 +200,12 @@
 # CONFIG_NLS_ISO8859_5 is not set
 # CONFIG_NLS_ISO8859_6 is not set
 # CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
 # CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
 # CONFIG_NLS_ISO8859_14 is not set
 # CONFIG_NLS_ISO8859_15 is not set
 # CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
 # CONFIG_NLS_UTF8 is not set
 
 #
diff -Naur -X exclude-files ac_cur/arch/um/drivers/stdio_console.c ac/arch/um/drivers/stdio_console.c
--- ac_cur/arch/um/drivers/stdio_console.c	Thu Jun 14 17:46:20 2001
+++ ac/arch/um/drivers/stdio_console.c	Thu Jun 14 17:55:43 2001
@@ -261,6 +261,17 @@
 
 __setup("con", console_chan_setup);
 
+static void console_exit(void)
+{
+	int i;
+
+	for(i=0;i<sizeof(vts)/sizeof(vts[0]);i++){
+		close_chan_pair(&vts[i].chan);
+	}
+}
+
+__exitcall(console_exit);
+
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * Emacs will notice this stuff at the end of the file and automatically
diff -Naur -X exclude-files ac_cur/arch/um/fs/hostfs/hostfs_kern.c ac/arch/um/fs/hostfs/hostfs_kern.c
--- ac_cur/arch/um/fs/hostfs/hostfs_kern.c	Thu Jun 14 17:46:20 2001
+++ ac/arch/um/fs/hostfs/hostfs_kern.c	Thu Jun 14 17:56:48 2001
@@ -540,6 +540,7 @@
 	if(name == NULL) return(-ENOMEM);
 	err = access_file(name, r, w, x);
 	kfree(name);
+	if(!err) err = vfs_permission(ino, desired);
 	return(err);
 }
 
diff -Naur -X exclude-files ac_cur/arch/um/include/sysdep-i386/syscalls.h ac/arch/um/include/sysdep-i386/syscalls.h
--- ac_cur/arch/um/include/sysdep-i386/syscalls.h	Thu Jun 14 17:46:20 2001
+++ ac/arch/um/include/sysdep-i386/syscalls.h	Thu Jun 14 17:57:44 2001
@@ -41,7 +41,7 @@
 	[ __NR_mincore ] = sys_mincore, \
 	[ __NR_madvise ] = sys_madvise,
 
-#define LAST_SYSCALL __NR_madvise
+#define LAST_SYSCALL __NR_fcntl64
 
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
diff -Naur -X exclude-files ac_cur/arch/um/kernel/ksyms.c ac/arch/um/kernel/ksyms.c
--- ac_cur/arch/um/kernel/ksyms.c	Thu Jun 14 17:46:20 2001
+++ ac/arch/um/kernel/ksyms.c	Thu Jun 14 17:59:50 2001
@@ -16,3 +16,4 @@
 EXPORT_SYMBOL(__const_udelay);
 EXPORT_SYMBOL(sys_waitpid);
 EXPORT_SYMBOL(__do_copy_from_user);
+EXPORT_SYMBOL(task_size);
diff -Naur -X exclude-files ac_cur/arch/um/kernel/sys_call_table.c ac/arch/um/kernel/sys_call_table.c
--- ac_cur/arch/um/kernel/sys_call_table.c	Thu Jun 14 17:46:20 2001
+++ ac/arch/um/kernel/sys_call_table.c	Thu Jun 14 18:01:15 2001
@@ -215,6 +215,8 @@
 extern syscall_handler_t sys_pivot_root;
 extern syscall_handler_t sys_mincore;
 extern syscall_handler_t sys_madvise;
+extern syscall_handler_t sys_fcntl64;
+extern syscall_handler_t sys_getdents64;
 
 extern syscall_handler_t um_mount;
 extern syscall_handler_t um_time;
@@ -421,6 +423,8 @@
 	[ __NR_stat64 ] = sys_stat64,
 	[ __NR_lstat64 ] = sys_lstat64,
 	[ __NR_fstat64 ] = sys_fstat64,
+	[ __NR_fcntl64 ] = sys_fcntl64,
+	[ __NR_getdents64 ] = sys_getdents64,
 	ARCH_SYSCALLS
 	[ LAST_SYSCALL + 1 ... NR_syscalls ] = 
 	        (syscall_handler_t *) sys_ni_syscall
diff -Naur -X exclude-files ac_cur/arch/um/kernel/um_arch.c ac/arch/um/kernel/um_arch.c
--- ac_cur/arch/um/kernel/um_arch.c	Thu Jun 14 17:46:20 2001
+++ ac/arch/um/kernel/um_arch.c	Thu Jun 14 18:03:25 2001
@@ -184,6 +184,7 @@
 
 void *brk_start;
 int brk_fd;
+unsigned long task_size;
 
 int linux_main(int argc, char **argv)
 {
@@ -206,6 +207,9 @@
 	remap_profiling_buffers();
 #endif
 
+	/* Round up to the nearest 4M */
+	task_size = ((((unsigned long) &argc) + (1 << 22)) & ~((1 << 22) - 1));
+ 
 	/* Create fake command line from argv[]. */
 	have_root = 0;
 	physmem_size = 16 * 1024 * 1024;
diff -Naur -X exclude-files ac_cur/include/asm-um/processor.h ac/include/asm-um/processor.h
--- ac_cur/include/asm-um/processor.h	Thu Jun 14 17:46:47 2001
+++ ac/include/asm-um/processor.h	Thu Jun 14 18:40:31 2001
@@ -196,12 +196,14 @@
 /*
  * User space process size: 3GB (default).
  */
-#define TASK_SIZE	(0xc0000000)
+extern unsigned long task_size;
+
+#define TASK_SIZE	(task_size)
 
 /* This decides where the kernel will search for a free chunk of vm
  * space during mmap's.
  */
-#define TASK_UNMAPPED_BASE	(TASK_SIZE / 3)
+#define TASK_UNMAPPED_BASE	(0x40000000)
 
 extern void start_thread(struct pt_regs *regs, unsigned long entry, 
 			 unsigned long stack);
diff -Naur -X exclude-files ac_cur/include/asm-um/uaccess.h ac/include/asm-um/uaccess.h
--- ac_cur/include/asm-um/uaccess.h	Thu Jun 14 17:46:47 2001
+++ ac/include/asm-um/uaccess.h	Thu Jun 14 18:40:32 2001
@@ -153,8 +153,8 @@
 static inline int strnlen_user(void *str, int len)
 {
 	return(__do_strnlen_user(str, len,
-				 &current_task->thread.fault_addr,
-				 &current_task->thread.fault_catcher));
+				 &current->thread.fault_addr,
+				 &current->thread.fault_catcher));
 }
 
 #define strlen_user(str) strnlen_user(str, ~0UL >> 1)