diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-02-04 08:45:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-02-04 08:45:42 +0100 |
| commit | 98cb621081705e2244ef6c265ff8a9f2208c7e2a (patch) | |
| tree | 6205be47a83d54d3e35e049b67973244120f8bd6 /arch/s390/kernel/vdso.c | |
| parent | Merge tag 'perf-core-for-mingo-5.0-20190126' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | perf/core: Don't WARN() for impossible ring-buffer sizes (diff) | |
| download | linux-98cb621081705e2244ef6c265ff8a9f2208c7e2a.tar.xz linux-98cb621081705e2244ef6c265ff8a9f2208c7e2a.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/kernel/vdso.c')
| -rw-r--r-- | arch/s390/kernel/vdso.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c index ebe748a9f472..4ff354887db4 100644 --- a/arch/s390/kernel/vdso.c +++ b/arch/s390/kernel/vdso.c @@ -224,10 +224,9 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) vdso_pages = vdso64_pages; #ifdef CONFIG_COMPAT - if (is_compat_task()) { + mm->context.compat_mm = is_compat_task(); + if (mm->context.compat_mm) vdso_pages = vdso32_pages; - mm->context.compat_mm = 1; - } #endif /* * vDSO has a problem and was disabled, just don't "enable" it for |