summaryrefslogtreecommitdiff
path: root/arch/mips/vdso
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-08-06 13:24:50 +0200
committerPaul Burton <paul.burton@mips.com>2019-08-06 14:32:15 -0700
commit6393e60644862478a9da8c6599ffc04f7f94bedf (patch)
treeb2cadc8acee6236cc085fe2c3b576cd124ea5109 /arch/mips/vdso
parent905421ee15357c31d5d201de9c1efafc69ea78db (diff)
mips: fix vdso32 build, again
The generic vdso support adds the same #if hack in two places, asm/vdso/vdso.h and config-n32-o32-env.c, but only the second is actually used. The result lacks the BUILD_VDSO32_64 macro, and that triggers a build error: ./include/linux/page-flags-layout.h:95:2: error: #error "Not enough bits in page flags" Move the macro into the other place, and remove the duplicated bits. Reported-by: Guenter Roeck <linux@roeck-us.net> Fixes: ee38d94a0ad8 ("page flags: prioritize kasan bits over last-cpuid") Fixes: 24640f233b46 ("mips: Add support for generic vDSO") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Andrey Konovalov <andreyknvl@google.com> Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Christoph Lameter <cl@linux.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com> Cc: James Hogan <jhogan@kernel.org> Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org
Diffstat (limited to 'arch/mips/vdso')
-rw-r--r--arch/mips/vdso/config-n32-o32-env.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/vdso/config-n32-o32-env.c b/arch/mips/vdso/config-n32-o32-env.c
index da4994b2b3e5..7f8d957abd4a 100644
--- a/arch/mips/vdso/config-n32-o32-env.c
+++ b/arch/mips/vdso/config-n32-o32-env.c
@@ -12,6 +12,7 @@
#define CONFIG_32BIT 1
#define CONFIG_GENERIC_ATOMIC64 1
+#define BUILD_VDSO32_64
#endif