The patch titled
Subject: mips: fix vdso32 build, again
has been removed from the -mm tree. Its filename was
mips-add-support-for-generic-vdso-fix.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: 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.
Link: http://lkml.kernel.org/r/20190806112509.3244608-1-arnd@xxxxxxxx
Fixes: ee38d94a0ad8 ("page flags: prioritize kasan bits over last-cpuid")
Fixes: 24640f233b46 ("mips: Add support for generic vDSO")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: Andrey Konovalov <andreyknvl@xxxxxxxxxx>
Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx>
Cc: Will Deacon <will.deacon@xxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>
Cc: Mark Rutland <mark.rutland@xxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: Paul Burton <paul.burton@xxxxxxxx>
Cc: Vincenzo Frascino <vincenzo.frascino@xxxxxxx>
Cc: James Hogan <jhogan@xxxxxxxxxx>,
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/mips/include/asm/vdso/vdso.h | 11 -----------
arch/mips/vdso/config-n32-o32-env.c | 1 +
2 files changed, 1 insertion(+), 11 deletions(-)
--- a/arch/mips/include/asm/vdso/vdso.h~mips-add-support-for-generic-vdso-fix
+++ a/arch/mips/include/asm/vdso/vdso.h
@@ -6,17 +6,6 @@
#include <asm/sgidefs.h>
-#if _MIPS_SIM != _MIPS_SIM_ABI64 && defined(CONFIG_64BIT)
-
-/* Building 32-bit VDSO for the 64-bit kernel. Fake a 32-bit Kconfig. */
-#define BUILD_VDSO32_64
-#undef CONFIG_64BIT
-#define CONFIG_32BIT 1
-#ifndef __ASSEMBLY__
-#include <asm-generic/atomic64.h>
-#endif
-#endif
-
#ifndef __ASSEMBLY__
#include <asm/asm.h>
--- a/arch/mips/vdso/config-n32-o32-env.c~mips-add-support-for-generic-vdso-fix
+++ a/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
_
Patches currently in -mm which might be from arnd@xxxxxxxx are
mm-sparse-fix-memory-leak-of-sparsemap_buf-in-aliged-memory-fix.patch
