diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-02 09:07:40 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-02 09:07:39 -0700 |
| commit | 3939f41b22a36407fafffa2d204e08d197818719 (patch) | |
| tree | 8a13e4d0ea3b7bef6f53bea069f15ed758b13eb0 /mm | |
| parent | 9edaf67e545ca3d82d8fe90d3d917dfd78dee7c6 (diff) | |
| parent | b15484bc067e8c01e7cc2b186227f994547cf709 (diff) | |
Merge "Merge remote-tracking branch 'remotes/quic/dev/msm-4.4-8996au' into msm-4.4"
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mmap.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index a089cca8d79a..ebc9d1923c3d 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -48,6 +48,10 @@ #include <asm/tlb.h> #include <asm/mmu_context.h> +#ifdef CONFIG_MSM_APP_SETTINGS +#include <asm/app_api.h> +#endif + #include "internal.h" #ifndef arch_mmap_check @@ -1297,6 +1301,11 @@ unsigned long do_mmap(struct file *file, unsigned long addr, if (!len) return -EINVAL; +#ifdef CONFIG_MSM_APP_SETTINGS + if (use_app_setting) + apply_app_setting_bit(file); +#endif + /* * Does the application expect PROT_READ to imply PROT_EXEC? * |