From 266d59d3f0c51f4baab4444143b863976bb3b05c Mon Sep 17 00:00:00 2001
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Tue, 7 Oct 2008 14:00:12 -0400
Subject: [PATCH] --- yaml --- r: 113667 b: refs/heads/master c:
 92562927826fceb2f8e69c89e28161b8c1e0b125 h: refs/heads/master i:   113665:
 7fe7e5946f2a34b4afe5ff2c4ecd139240348956   113663:
 e6a0e50f2abe5324c8482d471a7fd66bbdab35a8 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/debugfs/inode.c    | 3 +--
 trunk/include/linux/magic.h | 4 ++++
 trunk/mm/shmem.c            | 4 +---
 trunk/security/inode.c      | 3 +--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f97b96fb7375..d1a963347082 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93db628658197aa46bd7f83d429908b6f187ec9c
+refs/heads/master: 92562927826fceb2f8e69c89e28161b8c1e0b125
diff --git a/trunk/fs/debugfs/inode.c b/trunk/fs/debugfs/inode.c
index 08e28c9bb416..3dbe2169cf36 100644
--- a/trunk/fs/debugfs/inode.c
+++ b/trunk/fs/debugfs/inode.c
@@ -26,8 +26,7 @@
 #include <linux/debugfs.h>
 #include <linux/fsnotify.h>
 #include <linux/string.h>
-
-#define DEBUGFS_MAGIC	0x64626720
+#include <linux/magic.h>
 
 static struct vfsmount *debugfs_mount;
 static int debugfs_mount_count;
diff --git a/trunk/include/linux/magic.h b/trunk/include/linux/magic.h
index 1fa0c2ce4dec..f7f3fdddbef0 100644
--- a/trunk/include/linux/magic.h
+++ b/trunk/include/linux/magic.h
@@ -6,6 +6,10 @@
 #define AFS_SUPER_MAGIC                0x5346414F
 #define AUTOFS_SUPER_MAGIC	0x0187
 #define CODA_SUPER_MAGIC	0x73757245
+#define DEBUGFS_MAGIC          0x64626720
+#define SYSFS_MAGIC		0x62656572
+#define SECURITYFS_MAGIC	0x73636673
+#define TMPFS_MAGIC		0x01021994
 #define EFS_SUPER_MAGIC		0x414A53
 #define EXT2_SUPER_MAGIC	0xEF53
 #define EXT3_SUPER_MAGIC	0xEF53
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index 04fb4f1ab88e..bf66d0191baf 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -50,14 +50,12 @@
 #include <linux/migrate.h>
 #include <linux/highmem.h>
 #include <linux/seq_file.h>
+#include <linux/magic.h>
 
 #include <asm/uaccess.h>
 #include <asm/div64.h>
 #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)
 #define BLOCKS_PER_PAGE  (PAGE_CACHE_SIZE/512)
diff --git a/trunk/security/inode.c b/trunk/security/inode.c
index ca4958ebad8d..efea5a605466 100644
--- a/trunk/security/inode.c
+++ b/trunk/security/inode.c
@@ -20,8 +20,7 @@
 #include <linux/init.h>
 #include <linux/namei.h>
 #include <linux/security.h>
-
-#define SECURITYFS_MAGIC	0x73636673
+#include <linux/magic.h>
 
 static struct vfsmount *mount;
 static int mount_count;