diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-02-26 17:14:12 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-03-06 19:29:03 +0100 |
| commit | d3e5bab923d35f73c74f6dbbb761988d4f58f878 (patch) | |
| tree | c7cdb963454ddeb0807957ed4af4b23751050074 /arch/arc | |
| parent | arch: consolidate existing CONFIG_PAGE_SIZE_*KB definitions (diff) | |
| download | linux-d3e5bab923d35f73c74f6dbbb761988d4f58f878.tar.xz linux-d3e5bab923d35f73c74f6dbbb761988d4f58f878.zip | |
arch: simplify architecture specific page size configuration
arc, arm64, parisc and powerpc all have their own Kconfig symbols
in place of the common CONFIG_PAGE_SIZE_4KB symbols. Change these
so the common symbols are the ones that are actually used, while
leaving the arhcitecture specific ones as the user visible
place for configuring it, to avoid breaking user configs.
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> (powerpc32)
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Helge Deller <deller@gmx.de> # parisc
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arc/include/uapi/asm/page.h | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 1b0483c51cc1..4092bec198be 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -284,14 +284,17 @@ choice config ARC_PAGE_SIZE_8K bool "8KB" + select HAVE_PAGE_SIZE_8KB help Choose between 8k vs 16k config ARC_PAGE_SIZE_16K + select HAVE_PAGE_SIZE_16KB bool "16KB" config ARC_PAGE_SIZE_4K bool "4KB" + select HAVE_PAGE_SIZE_4KB depends on ARC_MMU_V3 || ARC_MMU_V4 endchoice diff --git a/arch/arc/include/uapi/asm/page.h b/arch/arc/include/uapi/asm/page.h index 2a4ad619abfb..7fd9e741b527 100644 --- a/arch/arc/include/uapi/asm/page.h +++ b/arch/arc/include/uapi/asm/page.h @@ -13,10 +13,8 @@ #include <linux/const.h> /* PAGE_SHIFT determines the page size */ -#if defined(CONFIG_ARC_PAGE_SIZE_16K) -#define PAGE_SHIFT 14 -#elif defined(CONFIG_ARC_PAGE_SIZE_4K) -#define PAGE_SHIFT 12 +#ifdef __KERNEL__ +#define PAGE_SHIFT CONFIG_PAGE_SHIFT #else /* * Default 8k |