diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2024-03-12 10:56:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2024-03-12 10:56:28 -0700 |
| commit | 65d287c7eb1d14e0f4d56f19cec30d97fc7e8f66 (patch) | |
| tree | 2cd93443a61a1bfb581d90d7047f378eba5edc7b /arch/x86/include | |
| parent | Merge tag 'soc-defconfig-6.9' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | arch: define CONFIG_PAGE_SIZE_*KB on all architectures (diff) | |
| download | linux-65d287c7eb1d14e0f4d56f19cec30d97fc7e8f66.tar.gz linux-65d287c7eb1d14e0f4d56f19cec30d97fc7e8f66.tar.bz2 linux-65d287c7eb1d14e0f4d56f19cec30d97fc7e8f66.zip | |
Merge tag 'asm-generic-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic updates from Arnd Bergmann:
"Just two small updates this time:
- A series I did to unify the definition of PAGE_SIZE through
Kconfig, intended to help with a vdso rework that needs the
constant but cannot include the normal kernel headers when building
the compat VDSO on arm64 and potentially others
- a patch from Yan Zhao to remove the pfn_to_virt() definitions from
a couple of architectures after finding they were both incorrect
and entirely unused"
* tag 'asm-generic-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
arch: define CONFIG_PAGE_SIZE_*KB on all architectures
arch: simplify architecture specific page size configuration
arch: consolidate existing CONFIG_PAGE_SIZE_*KB definitions
mm: Remove broken pfn_to_virt() on arch csky/hexagon/openrisc
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/page_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h index 86bd4311daf8..9da9c8a2f1df 100644 --- a/arch/x86/include/asm/page_types.h +++ b/arch/x86/include/asm/page_types.h @@ -7,7 +7,7 @@ #include <linux/mem_encrypt.h> /* PAGE_SHIFT determines the page size */ -#define PAGE_SHIFT 12 +#define PAGE_SHIFT CONFIG_PAGE_SHIFT #define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) |