mirror of
https://github.com/torvalds/linux.git
synced 2024-12-30 06:41:43 +00:00
6393e60644
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:ee38d94a0a("page flags: prioritize kasan bits over last-cpuid") Fixes:24640f233b("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
19 lines
412 B
C
19 lines
412 B
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Configuration file for O32 and N32 binaries.
|
|
* Note: To be included before lib/vdso/gettimeofday.c
|
|
*/
|
|
#if defined(CONFIG_MIPS32_O32) || defined(CONFIG_MIPS32_N32)
|
|
/*
|
|
* In case of a 32 bit VDSO for a 64 bit kernel fake a 32 bit kernel
|
|
* configuration.
|
|
*/
|
|
#undef CONFIG_64BIT
|
|
|
|
#define CONFIG_32BIT 1
|
|
#define CONFIG_GENERIC_ATOMIC64 1
|
|
#define BUILD_VDSO32_64
|
|
|
|
#endif
|
|
|