diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-01 14:33:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-01 14:34:26 +0800 |
| commit | 439863d92fda525a8f3b326a24490e91c70f0496 (patch) | |
| tree | ec25b3ae200d75f2be939a7da5305537dd9172f9 /fs/proc/root.c | |
| parent | 43c981bd2d8af8d91726be1fac389cdce47dce1e (diff) | |
| parent | 95123c0b81d9478b8155fe15093b88f57ef7d0bd (diff) | |
Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1lsk-v4.1-16.06
Conflicts:
adopt s/cpufreq_val/cpufreq_freqs in drivers/thermal/cpu_cooling.c
Diffstat (limited to 'fs/proc/root.c')
| -rw-r--r-- | fs/proc/root.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 68feb0f70e63..c3e1bc595e6d 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -121,6 +121,13 @@ static struct dentry *proc_mount(struct file_system_type *fs_type, if (IS_ERR(sb)) return ERR_CAST(sb); + /* + * procfs isn't actually a stacking filesystem; however, there is + * too much magic going on inside it to permit stacking things on + * top of it + */ + sb->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH; + if (!proc_parse_options(options, ns)) { deactivate_locked_super(sb); return ERR_PTR(-EINVAL); |