diff options
| author | maximilian attems <max@stro.at> | 2009-09-22 16:45:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 07:39:42 -0700 |
| commit | a7e3108cca54c105f496919040f00df56767ec00 (patch) | |
| tree | 42aaadd3648bada66632f50e9658d37bf7bb16c8 | |
| parent | 0d4c36a9b6ab6b15851f60956d901a3c53574ea8 (diff) | |
| download | kernel_samsung_aries-a7e3108cca54c105f496919040f00df56767ec00.zip kernel_samsung_aries-a7e3108cca54c105f496919040f00df56767ec00.tar.gz kernel_samsung_aries-a7e3108cca54c105f496919040f00df56767ec00.tar.bz2 | |
ramfs: move RAMFS_MAGIC to include/linux/magic.h
initramfs userspace likes to use this magic number.
Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/ramfs/inode.c | 4 | ||||
| -rw-r--r-- | include/linux/magic.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index a7f0110..a6090aa 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c @@ -34,12 +34,10 @@ #include <linux/ramfs.h> #include <linux/sched.h> #include <linux/parser.h> +#include <linux/magic.h> #include <asm/uaccess.h> #include "internal.h" -/* some random number */ -#define RAMFS_MAGIC 0x858458f6 - #define RAMFS_DEFAULT_MODE 0755 static const struct super_operations ramfs_ops; diff --git a/include/linux/magic.h b/include/linux/magic.h index bce3778..76285e0 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h @@ -12,6 +12,7 @@ #define SYSFS_MAGIC 0x62656572 #define SECURITYFS_MAGIC 0x73636673 #define SELINUX_MAGIC 0xf97cff8c +#define RAMFS_MAGIC 0x858458f6 /* some random number */ #define TMPFS_MAGIC 0x01021994 #define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ #define SQUASHFS_MAGIC 0x73717368 |