diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-24 11:32:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-24 11:32:15 -0800 |
| commit | bc570c14b260946a66e13882eace862dc6eb16f8 (patch) | |
| tree | b2bd972daa8ffaf44556bf2409d7d0f3b096e68b /mm | |
| parent | 2e90ca68b0d2f5548804f22f0dd61145516171e3 (diff) | |
| parent | bf4498ad3f9a0f7202cf90e52b5ce9bb31700b91 (diff) | |
| download | linux-bc570c14b260946a66e13882eace862dc6eb16f8.tar.gz linux-bc570c14b260946a66e13882eace862dc6eb16f8.tar.bz2 linux-bc570c14b260946a66e13882eace862dc6eb16f8.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull tmpfs fix from Al Viro:
"Regression from fs_parse series this cycle..."
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
tmpfs: deny and force are not huge mount options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index c8f7540ef048..aad3ba74b0e9 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3386,8 +3386,6 @@ static const struct constant_table shmem_param_enums_huge[] = { {"always", SHMEM_HUGE_ALWAYS }, {"within_size", SHMEM_HUGE_WITHIN_SIZE }, {"advise", SHMEM_HUGE_ADVISE }, - {"deny", SHMEM_HUGE_DENY }, - {"force", SHMEM_HUGE_FORCE }, {} }; |