--- linux-2.6.18.2/fs/inode.c	2006-09-20 16:58:35 +0200
+++ linux-2.6.18.2-vs2.1.1/fs/inode.c	2006-10-29 02:50:41 +0100
@@ -234,6 +242,8 @@ void __iget(struct inode * inode)
 	inodes_stat.nr_unused--;
 }
 
+EXPORT_SYMBOL_GPL(__iget);
+
 /**
  * clear_inode - clear an inode
  * @inode: inode to clear
--- linux-2.6.18.2/fs/sysfs/mount.c	2006-09-20 16:58:35 +0200
+++ linux-2.6.18.2-vs2.1.1/fs/sysfs/mount.c	2006-09-20 17:01:44 +0200
@@ -11,8 +11,6 @@
 
 #include "sysfs.h"
 
-/* Random magic number */
-#define SYSFS_MAGIC 0x62656572
 
 struct vfsmount *sysfs_mount;
 struct super_block * sysfs_sb = NULL;
--- linux-2.6.18.2/fs/sysfs/mount.c	2006-09-20 16:58:35 +0200
+++ linux-2.6.18.2-vs2.1.1/fs/sysfs/mount.c	2006-09-20 17:01:44 +0200
@@ -38,7 +36,7 @@ static int sysfs_fill_super(struct super
 
 	sb->s_blocksize = PAGE_CACHE_SIZE;
 	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
-	sb->s_magic = SYSFS_MAGIC;
+	sb->s_magic = SYSFS_SUPER_MAGIC;
 	sb->s_op = &sysfs_ops;
 	sb->s_time_gran = 1;
 	sysfs_sb = sb;
--- linux-2.6.18.2/include/asm-i386/elf.h	2006-09-20 16:58:40 +0200
+++ linux-2.6.18.2-vs2.1.1/include/asm-i386/elf.h	2006-09-25 15:40:02 +0200
@@ -75,7 +75,7 @@ typedef struct user_fxsr_struct elf_fpxr
    the loader.  We need to make sure that it is out of the way of the program
    that it will "exec", and that there is sufficient room for the brk.  */
 
-#define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
+#define ELF_ET_DYN_BASE		((TASK_UNMAPPED_BASE) * 2)
 
 /* regs is struct pt_regs, pr_reg is elf_gregset_t (which is
    now struct_user_regs, they are different) */
--- linux-2.6.18.2/include/linux/devpts_fs.h	2004-08-14 12:55:59 +0200
+++ linux-2.6.18.2-vs2.1.1/include/linux/devpts_fs.h	2006-09-20 17:01:45 +0200
@@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n
 
 #endif
 
+#define DEVPTS_SUPER_MAGIC	0x00001cd1
+
 
 #endif /* _LINUX_DEVPTS_FS_H */
--- linux-2.6.18.2/include/linux/shmem_fs.h	2006-04-09 13:49:57 +0200
+++ linux-2.6.18.2-vs2.1.1/include/linux/shmem_fs.h	2006-09-20 17:01:45 +0200
@@ -8,6 +8,9 @@
 
 #define SHMEM_NR_DIRECT 16
 
+#define TMPFS_SUPER_MAGIC	0x01021994
+
+
 struct shmem_inode_info {
 	spinlock_t		lock;
 	unsigned long		flags;
--- linux-2.6.18.2/include/linux/sysfs.h	2006-06-18 04:55:25 +0200
+++ linux-2.6.18.2-vs2.1.1/include/linux/sysfs.h	2006-09-20 17:01:45 +0200
@@ -12,6 +12,8 @@
 
 #include <asm/atomic.h>
 
+#define SYSFS_SUPER_MAGIC	0x62656572
+
 struct kobject;
 struct module;
 
--- linux-2.6.18.2/kernel/exit.c	2006-09-20 16:58:44 +0200
+++ linux-2.6.18.2-vs2.1.1/kernel/exit.c	2006-10-28 18:31:23 +0200
@@ -447,6 +451,7 @@ *****
 			}
 			i++;
 			set >>= 1;
+			cond_resched();
 		}
 	}
 }
--- linux-2.6.18.2/mm/shmem.c	2006-09-20 16:58:45 +0200
+++ linux-2.6.18.2-vs2.1.1/mm/shmem.c	2006-09-20 17:01:45 +0200
@@ -51,7 +51,6 @@
 #include <asm/pgtable.h>
 
 /* This magic number is used in glibc for posix shared memory */
-#define TMPFS_MAGIC	0x01021994
 
 #define ENTRIES_PER_PAGE (PAGE_CACHE_SIZE/sizeof(unsigned long))
 #define ENTRIES_PER_PAGEPAGE (ENTRIES_PER_PAGE*ENTRIES_PER_PAGE)
--- linux-2.6.18.2/mm/shmem.c	2006-09-20 16:58:45 +0200
+++ linux-2.6.18.2-vs2.1.1/mm/shmem.c	2006-09-20 17:01:45 +0200
@@ -1648,7 +1647,7 @@ static int shmem_statfs(struct dentry *d
 {
 	struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
 
-	buf->f_type = TMPFS_MAGIC;
+	buf->f_type = TMPFS_SUPER_MAGIC;
 	buf->f_bsize = PAGE_CACHE_SIZE;
 	buf->f_namelen = NAME_MAX;
 	spin_lock(&sbinfo->stat_lock);
--- linux-2.6.18.2/mm/shmem.c	2006-09-20 16:58:45 +0200
+++ linux-2.6.18.2-vs2.1.1/mm/shmem.c	2006-09-20 17:01:45 +0200
@@ -2091,7 +2090,7 @@ static int shmem_fill_super(struct super
 	sb->s_maxbytes = SHMEM_MAX_BYTES;
 	sb->s_blocksize = PAGE_CACHE_SIZE;
 	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
-	sb->s_magic = TMPFS_MAGIC;
+	sb->s_magic = TMPFS_SUPER_MAGIC;
 	sb->s_op = &shmem_ops;
 	sb->s_time_gran = 1;