aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/kvm/kvm_main.c4
-rw-r--r--include/linux/magic.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index ca82ba359e1a..a163bca38973 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -20,6 +20,7 @@
20#include <linux/kvm.h> 20#include <linux/kvm.h>
21#include <linux/module.h> 21#include <linux/module.h>
22#include <linux/errno.h> 22#include <linux/errno.h>
23#include <linux/magic.h>
23#include <asm/processor.h> 24#include <asm/processor.h>
24#include <linux/percpu.h> 25#include <linux/percpu.h>
25#include <linux/gfp.h> 26#include <linux/gfp.h>
@@ -75,7 +76,6 @@ static struct kvm_stats_debugfs_item {
75 76
76static struct dentry *debugfs_dir; 77static struct dentry *debugfs_dir;
77 78
78#define KVMFS_MAGIC 0x19700426
79struct vfsmount *kvmfs_mnt; 79struct vfsmount *kvmfs_mnt;
80 80
81#define MAX_IO_MSRS 256 81#define MAX_IO_MSRS 256
@@ -2433,7 +2433,7 @@ hpa_t bad_page_address;
2433static int kvmfs_get_sb(struct file_system_type *fs_type, int flags, 2433static int kvmfs_get_sb(struct file_system_type *fs_type, int flags,
2434 const char *dev_name, void *data, struct vfsmount *mnt) 2434 const char *dev_name, void *data, struct vfsmount *mnt)
2435{ 2435{
2436 return get_sb_pseudo(fs_type, "kvm:", NULL, KVMFS_MAGIC, mnt); 2436 return get_sb_pseudo(fs_type, "kvm:", NULL, KVMFS_SUPER_MAGIC, mnt);
2437} 2437}
2438 2438
2439static struct file_system_type kvm_fs_type = { 2439static struct file_system_type kvm_fs_type = {
diff --git a/include/linux/magic.h b/include/linux/magic.h
index b32c8a97fcec..a9c6567fe70c 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -13,6 +13,7 @@
13#define HPFS_SUPER_MAGIC 0xf995e849 13#define HPFS_SUPER_MAGIC 0xf995e849
14#define ISOFS_SUPER_MAGIC 0x9660 14#define ISOFS_SUPER_MAGIC 0x9660
15#define JFFS2_SUPER_MAGIC 0x72b6 15#define JFFS2_SUPER_MAGIC 0x72b6
16#define KVMFS_SUPER_MAGIC 0x19700426
16 17
17#define MINIX_SUPER_MAGIC 0x137F /* original minix fs */ 18#define MINIX_SUPER_MAGIC 0x137F /* original minix fs */
18#define MINIX_SUPER_MAGIC2 0x138F /* minix fs, 30 char names */ 19#define MINIX_SUPER_MAGIC2 0x138F /* minix fs, 30 char names */