diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-19 19:04:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-19 19:04:47 +0200 |
| commit | 3e10e879a8c334a5927d800a3663a24d562cfa31 (patch) | |
| tree | 5d18bc7e38c986a044e99aa0d0a4aff4931ec7d0 /security/inode.c | |
| parent | 98d9c66ab07471006fd7910cb16453581c41a3e7 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
| download | kernel-crypto-3e10e879a8c334a5927d800a3663a24d562cfa31.tar.gz kernel-crypto-3e10e879a8c334a5927d800a3663a24d562cfa31.tar.xz kernel-crypto-3e10e879a8c334a5927d800a3663a24d562cfa31.zip | |
Merge branch 'linus' into tracing-v28-for-linus-v3
Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl
Diffstat (limited to 'security/inode.c')
| -rw-r--r-- | security/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/inode.c b/security/inode.c index ca4958ebad8..efea5a60546 100644 --- a/security/inode.c +++ b/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; |