From: Arnd Bergmann <a...@arndb.de>

Naresh noticed that the newly added usage of the PAGE_SIZE macro in
include/vdso/datapage.h introduced a build regression. I had an older
patch that I revived to have this defined through Kconfig rather than
through including asm/page.h, which is not allowed in vdso code.

The vdso patch series now has a temporary workaround, but I still want to
get this into v6.9 so we can place the hack with CONFIG_PAGE_SIZE
in the vdso.

I've applied this to the asm-generic tree already, please let me know if
there are still remaining issues. It's really close to the merge window
already, so I'd probably give this a few more days before I send a pull
request, or defer it to v6.10 if anything goes wrong.

Sorry for the delay, I was still waiting to resolve the m68k question,
but there were no further replies in the end, so I kept my original
version.

Changes from v1:

 - improve Kconfig help texts
 - remove an extraneous line in hexagon

      Arnd

Link: 
https://lore.kernel.org/lkml/ca+g9fytrxxm_ko9fnpz3xarxhv7ud_yqp-teupqrnrhu+_0...@mail.gmail.com/
Link: https://lore.kernel.org/all/65dc6c14.170a0220.f4a3f.9...@mx.google.com/
Link: https://lore.kernel.org/lkml/20240226161414.2316610-1-a...@kernel.org/

Arnd Bergmann (3):
  arch: consolidate existing CONFIG_PAGE_SIZE_*KB definitions
  arch: simplify architecture specific page size configuration
  arch: define CONFIG_PAGE_SIZE_*KB on all architectures

 arch/Kconfig                       | 92 +++++++++++++++++++++++++++++-
 arch/alpha/Kconfig                 |  1 +
 arch/alpha/include/asm/page.h      |  2 +-
 arch/arc/Kconfig                   |  3 +
 arch/arc/include/uapi/asm/page.h   |  6 +-
 arch/arm/Kconfig                   |  1 +
 arch/arm/include/asm/page.h        |  2 +-
 arch/arm64/Kconfig                 | 29 +++++-----
 arch/arm64/include/asm/page-def.h  |  2 +-
 arch/csky/Kconfig                  |  1 +
 arch/csky/include/asm/page.h       |  2 +-
 arch/hexagon/Kconfig               | 24 ++------
 arch/hexagon/include/asm/page.h    |  6 +-
 arch/loongarch/Kconfig             | 21 ++-----
 arch/loongarch/include/asm/page.h  | 10 +---
 arch/m68k/Kconfig                  |  3 +
 arch/m68k/Kconfig.cpu              |  2 +
 arch/m68k/include/asm/page.h       |  6 +-
 arch/microblaze/Kconfig            |  1 +
 arch/microblaze/include/asm/page.h |  2 +-
 arch/mips/Kconfig                  | 58 ++-----------------
 arch/mips/include/asm/page.h       | 16 +-----
 arch/nios2/Kconfig                 |  1 +
 arch/nios2/include/asm/page.h      |  2 +-
 arch/openrisc/Kconfig              |  1 +
 arch/openrisc/include/asm/page.h   |  2 +-
 arch/parisc/Kconfig                |  3 +
 arch/parisc/include/asm/page.h     | 10 +---
 arch/powerpc/Kconfig               | 31 ++--------
 arch/powerpc/include/asm/page.h    |  2 +-
 arch/riscv/Kconfig                 |  1 +
 arch/riscv/include/asm/page.h      |  2 +-
 arch/s390/Kconfig                  |  1 +
 arch/s390/include/asm/page.h       |  2 +-
 arch/sh/include/asm/page.h         | 13 +----
 arch/sh/mm/Kconfig                 | 42 ++++----------
 arch/sparc/Kconfig                 |  2 +
 arch/sparc/include/asm/page_32.h   |  2 +-
 arch/sparc/include/asm/page_64.h   |  3 +-
 arch/um/Kconfig                    |  1 +
 arch/um/include/asm/page.h         |  2 +-
 arch/x86/Kconfig                   |  1 +
 arch/x86/include/asm/page_types.h  |  2 +-
 arch/xtensa/Kconfig                |  1 +
 arch/xtensa/include/asm/page.h     |  2 +-
 scripts/gdb/linux/constants.py.in  |  2 +-
 scripts/gdb/linux/mm.py            |  2 +-
 47 files changed, 185 insertions(+), 238 deletions(-)

-- 
2.39.2

To: Thomas Gleixner <t...@linutronix.de>
To: Vincenzo Frascino <vincenzo.frasc...@arm.com>
To: Kees Cook <keesc...@chromium.org>
To: Anna-Maria Behnsen <anna-ma...@linutronix.de>
Cc: Matt Turner <matts...@gmail.com>
Cc: Vineet Gupta <vgu...@kernel.org>
Cc: Russell King <li...@armlinux.org.uk>
Cc: Catalin Marinas <catalin.mari...@arm.com>
Cc: Guo Ren <guo...@kernel.org>
Cc: Brian Cain <bc...@quicinc.com>
Cc: Huacai Chen <chenhua...@kernel.org>
Cc: Geert Uytterhoeven <ge...@linux-m68k.org>
Cc: Michal Simek <mon...@monstr.eu>
Cc: Thomas Bogendoerfer <tsbog...@alpha.franken.de>
Cc: Helge Deller <del...@gmx.de>
Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: Christophe Leroy <christophe.le...@csgroup.eu>
Cc: Palmer Dabbelt <pal...@dabbelt.com>
Cc: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>
Cc: Andreas Larsson <andr...@gaisler.com>
Cc: Richard Weinberger <rich...@nod.at>
Cc: x...@kernel.org
Cc: Max Filippov <jcmvb...@gmail.com>
Cc: Andy Lutomirski <l...@kernel.org>
Cc: Vincenzo Frascino <vincenzo.frasc...@arm.com>
Cc: Jan Kiszka <jan.kis...@siemens.com>
Cc: Kieran Bingham <kbing...@kernel.org>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: linux-ker...@vger.kernel.org
Cc: linux-al...@vger.kernel.org
Cc: linux-snps-arc@lists.infradead.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c...@vger.kernel.org
Cc: linux-hexa...@vger.kernel.org
Cc: loonga...@lists.linux.dev
Cc: linux-m...@lists.linux-m68k.org
Cc: linux-m...@vger.kernel.org
Cc: linux-openr...@vger.kernel.org
Cc: linux-par...@vger.kernel.org
Cc: linuxppc-...@lists.ozlabs.org
Cc: linux-ri...@lists.infradead.org
Cc: linux-s...@vger.kernel.org
Cc: linux...@vger.kernel.org
Cc: sparcli...@vger.kernel.org
Cc: linux...@lists.infradead.org

_______________________________________________
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc

Reply via email to