--- olpc-2.6-master.00/fs/sysfs/mount.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/sysfs/mount.c	2007-03-01 11:52:20.000000000 -0500
@@ -12,8 +12,6 @@
 
 #include "sysfs.h"
 
-/* Random magic number */
-#define SYSFS_MAGIC 0x62656572
 
 struct vfsmount *sysfs_mount;
 struct super_block * sysfs_sb = NULL;
--- olpc-2.6-master.00/fs/sysfs/mount.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/sysfs/mount.c	2007-03-01 11:52:20.000000000 -0500
@@ -47,7 +45,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;
--- olpc-2.6-master.00/include/linux/devpts_fs.h	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/include/linux/devpts_fs.h	2007-03-01 11:52:20.000000000 -0500
@@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n
 
 #endif
 
+#define DEVPTS_SUPER_MAGIC	0x00001cd1
+
 
 #endif /* _LINUX_DEVPTS_FS_H */
--- olpc-2.6-master.00/include/linux/shmem_fs.h	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/include/linux/shmem_fs.h	2007-03-01 11:52:20.000000000 -0500
@@ -8,6 +8,9 @@
 
 #define SHMEM_NR_DIRECT 16
 
+#define TMPFS_SUPER_MAGIC	0x01021994
+
+
 struct shmem_inode_info {
 	spinlock_t		lock;
 	unsigned long		flags;
--- olpc-2.6-master.00/include/linux/sysfs.h	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/include/linux/sysfs.h	2007-03-01 11:52:20.000000000 -0500
@@ -14,6 +14,8 @@
 #include <linux/list.h>
 #include <asm/atomic.h>
 
+#define SYSFS_SUPER_MAGIC	0x62656572
+
 struct kobject;
 struct module;
 struct nameidata;
--- olpc-2.6-master.00/mm/shmem.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/mm/shmem.c	2007-03-01 11:52:20.000000000 -0500
@@ -55,7 +55,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)
--- olpc-2.6-master.00/mm/shmem.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/mm/shmem.c	2007-03-01 11:52:20.000000000 -0500
@@ -1663,7 +1662,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);
--- olpc-2.6-master.00/mm/shmem.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/mm/shmem.c	2007-03-01 11:52:20.000000000 -0500
@@ -2237,7 +2236,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;
 #ifdef CONFIG_TMPFS_POSIX_ACL
--- olpc-2.6-master.00/fs/devpts/inode.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/devpts/inode.c	2007-03-01 11:52:20.000000000 -0500
@@ -19,7 +19,6 @@
 #include <linux/devpts_fs.h>
 #include <linux/parser.h>
 
-#define DEVPTS_SUPER_MAGIC 0x1cd1
 
 static struct vfsmount *devpts_mnt;
 static struct dentry *devpts_root;