Linux-MIPS Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] mips: fix vdso32 build, again
@ 2019-08-06 11:24 Arnd Bergmann
  2019-08-06 23:02 ` Paul Burton
  0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2019-08-06 11:24 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Arnd Bergmann, Guenter Roeck, Andrey Konovalov, Andrey Ryabinin,
	Dmitry Vyukov, Will Deacon, Christoph Lameter, Mark Rutland,
	Ralf Baechle, Paul Burton, Vincenzo Frascino, James Hogan,
	linux-mips, linux-kernel

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>
---
Please fold into the vdso patch
---
 arch/mips/include/asm/vdso/vdso.h   | 11 -----------
 arch/mips/vdso/config-n32-o32-env.c |  1 +
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/arch/mips/include/asm/vdso/vdso.h b/arch/mips/include/asm/vdso/vdso.h
index 3b96db735f7f..737ddfc3411c 100644
--- a/arch/mips/include/asm/vdso/vdso.h
+++ b/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>
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
 
-- 
2.20.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] mips: fix vdso32 build, again
  2019-08-06 11:24 [PATCH] mips: fix vdso32 build, again Arnd Bergmann
@ 2019-08-06 23:02 ` Paul Burton
  0 siblings, 0 replies; 2+ messages in thread
From: Paul Burton @ 2019-08-06 23:02 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Andrew Morton, Arnd Bergmann, Guenter Roeck, Andrey Konovalov,
	Andrey Ryabinin, Dmitry Vyukov, Will Deacon, Christoph Lameter,
	Mark Rutland, Ralf Baechle, Paul Burton, Vincenzo Frascino,
	James Hogan, linux-mips, linux-kernel, linux-mips

Hello,

Arnd Bergmann wrote:
> 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.

Applied to mips-next.

> commit 6393e6064486
> https://git.kernel.org/mips/c/6393e6064486
> 
> 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>

Thanks,
    Paul

[ This message was auto-generated; if you believe anything is incorrect
  then please email paul.burton@mips.com to report it. ]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-06 11:24 [PATCH] mips: fix vdso32 build, again Arnd Bergmann
2019-08-06 23:02 ` Paul Burton

Linux-MIPS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-mips/0 linux-mips/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-mips linux-mips/ https://lore.kernel.org/linux-mips \
		linux-mips@vger.kernel.org linux-mips@archiver.kernel.org
	public-inbox-index linux-mips


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-mips


AGPL code for this site: git clone https://public-inbox.org/ public-inbox