diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
commit | 11cbb42a86895b88ac906a6768c998f9e98a37e2 (patch) | |
tree | 3eaeec2cff4c7e34add793c77079cdc85b058bb8 /kernel/sysctl_binary.c | |
parent | 95ffb43f1ba759fb1205a8ce38a7ea5bab6be02d (diff) | |
parent | 95bcc3e563748f65c9fc0eb1bbc3f99b76efd4b2 (diff) |
Merge remote-tracking branch 'origin/v4.4/topic/hibernate' into hikey-mainline-rebase-4.4hikey-hibernate-v4.4
Conflicts:
arch/arm64/Makefile
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/asm-offsets.c
arch/arm64/kvm/hyp/fpsimd.S
drivers/firmware/psci.c
fs/proc/task_mmu.c
mm/memcontrol.c
Diffstat (limited to 'kernel/sysctl_binary.c')
-rw-r--r-- | kernel/sysctl_binary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 7e7746a42a62..10a1d7dc9313 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c @@ -1321,7 +1321,7 @@ static ssize_t binary_sysctl(const int *name, int nlen, } mnt = task_active_pid_ns(current)->proc_mnt; - file = file_open_root(mnt->mnt_root, mnt, pathname, flags); + file = file_open_root(mnt->mnt_root, mnt, pathname, flags, 0); result = PTR_ERR(file); if (IS_ERR(file)) goto out_putname; |