diff options
| author | Ben Cheng <bccheng@google.com> | 2012-03-07 16:16:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 16:16:10 -0800 |
| commit | 36c8c1039fca1c338796c4a8951c31e4fdf1d3b9 (patch) | |
| tree | fc661a73e7311d4b2cfceb47f3eb9228e16ab96b /libc/kernel/common/linux/magic.h | |
| parent | 27a5923b24a7f0a1a75498bcb6771f380b681e09 (diff) | |
| parent | 4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd (diff) | |
| download | android_bionic-36c8c1039fca1c338796c4a8951c31e4fdf1d3b9.tar.gz android_bionic-36c8c1039fca1c338796c4a8951c31e4fdf1d3b9.tar.bz2 android_bionic-36c8c1039fca1c338796c4a8951c31e4fdf1d3b9.zip | |
Merge "Revert "Update bionic kernel headers using update_all.py""
Diffstat (limited to 'libc/kernel/common/linux/magic.h')
| -rw-r--r-- | libc/kernel/common/linux/magic.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/libc/kernel/common/linux/magic.h b/libc/kernel/common/linux/magic.h index 76f334c10..c94f9ce0c 100644 --- a/libc/kernel/common/linux/magic.h +++ b/libc/kernel/common/linux/magic.h @@ -7,57 +7,49 @@ *** structures, and macros generated from the original header, and thus, *** contains no copyrightable information. *** - *** To edit the content of this header, modify the corresponding - *** source file (e.g. under external/kernel-headers/original/) then - *** run bionic/libc/kernel/tools/update_all.py - *** - *** Any manual change here will be lost the next time this script will - *** be run. You've been warned! - *** **************************************************************************** ****************************************************************************/ #ifndef __LINUX_MAGIC_H__ #define __LINUX_MAGIC_H__ + #define ADFS_SUPER_MAGIC 0xadf5 #define AFFS_SUPER_MAGIC 0xadff -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define AFS_SUPER_MAGIC 0x5346414F #define AUTOFS_SUPER_MAGIC 0x0187 #define CODA_SUPER_MAGIC 0x73757245 #define EFS_SUPER_MAGIC 0x414A53 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define EXT2_SUPER_MAGIC 0xEF53 #define EXT3_SUPER_MAGIC 0xEF53 #define EXT4_SUPER_MAGIC 0xEF53 #define HPFS_SUPER_MAGIC 0xf995e849 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ISOFS_SUPER_MAGIC 0x9660 #define JFFS2_SUPER_MAGIC 0x72b6 #define ANON_INODE_FS_MAGIC 0x09041934 + #define MINIX_SUPER_MAGIC 0x137F -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define MINIX_SUPER_MAGIC2 0x138F #define MINIX2_SUPER_MAGIC 0x2468 #define MINIX2_SUPER_MAGIC2 0x2478 #define MINIX3_SUPER_MAGIC 0x4d5a -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #define MSDOS_SUPER_MAGIC 0x4d44 #define NCP_SUPER_MAGIC 0x564c #define NFS_SUPER_MAGIC 0x6969 #define OPENPROM_SUPER_MAGIC 0x9fa1 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define PROC_SUPER_MAGIC 0x9fa0 #define QNX4_SUPER_MAGIC 0x002f + #define REISERFS_SUPER_MAGIC 0x52654973 + #define REISERFS_SUPER_MAGIC_STRING "ReIsErFs" -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs" #define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs" + #define SMB_SUPER_MAGIC 0x517B #define USBDEVICE_SUPER_MAGIC 0x9fa2 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define CGROUP_SUPER_MAGIC 0x27e0eb + #define FUTEXFS_SUPER_MAGIC 0xBAD1DEA #define INOTIFYFS_SUPER_MAGIC 0x2BAD1DEA + #endif -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ |