diff options
| author | Paolo Bonzini <[email protected]> | 2015-11-24 18:34:40 +0000 |
|---|---|---|
| committer | Paolo Bonzini <[email protected]> | 2015-11-24 18:34:40 +0000 |
| commit | 8bd142c01648cdb33e9bcafa0448ba2c20ed814c (patch) | |
| tree | 9197c60d3f9d4036f38f281a183e94750ceea1d7 /fs/ext2/super.c | |
| parent | Merge tag 'kvm-s390-master-4.4-1' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | arm64: kvm: report original PAR_EL1 upon panic (diff) | |
| download | kernel-8bd142c01648cdb33e9bcafa0448ba2c20ed814c.tar.gz kernel-8bd142c01648cdb33e9bcafa0448ba2c20ed814c.zip | |
Merge tag 'kvm-arm-for-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM Fixes for v4.4-rc3.
Includes some timer fixes, properly unmapping PTEs, an errata fix, and two
tweaks to the EL2 panic code.
Diffstat (limited to 'fs/ext2/super.c')
| -rw-r--r-- | fs/ext2/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 3a71cea68420..748d35afc902 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -569,6 +569,8 @@ static int parse_options(char *options, struct super_block *sb) /* Fall through */ case Opt_dax: #ifdef CONFIG_FS_DAX + ext2_msg(sb, KERN_WARNING, + "DAX enabled. Warning: EXPERIMENTAL, use at your own risk"); set_opt(sbi->s_mount_opt, DAX); #else ext2_msg(sb, KERN_INFO, "dax option not supported"); |