diff options
| author |  Alexander Gordeev <agordeev@linux.ibm.com>
| 2023-12-02 08:50:45 +0100 |
|---|---|---|
| committer | Alexander Gordeev <agordeev@linux.ibm.com>
| 2024-04-17 13:38:00 +0200 |
| commit | bbe72f39022270c40dc1e991b4dadf6f32eed86a (patch) | |
| tree | e330d081d393db2b2e7c494be333939754e03659 | |
| parent | s390/boot: Swap vmalloc and Lowcore/Real Memory Copy areas (diff) | |
| download | linux-bbe72f39022270c40dc1e991b4dadf6f32eed86a.tar.gz linux-bbe72f39022270c40dc1e991b4dadf6f32eed86a.tar.bz2 linux-bbe72f39022270c40dc1e991b4dadf6f32eed86a.zip | |
s390/mm: Move KASLR related to <asm/page.h>
Move everyting KASLR related to <asm/page.h>,
similarly to many other architectures.
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Suggested-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
| -rw-r--r-- | arch/s390/include/asm/page.h | 14 | ||||
| -rw-r--r-- | arch/s390/include/asm/setup.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h index 9381879f7ecf..602e8056b7cc 100644 --- a/arch/s390/include/asm/page.h +++ b/arch/s390/include/asm/page.h @@ -178,6 +178,20 @@ int arch_make_page_accessible(struct page *page); #define HAVE_ARCH_MAKE_PAGE_ACCESSIBLE #endif +extern unsigned long __kaslr_offset; +static inline unsigned long kaslr_offset(void) +{ + return __kaslr_offset; +} + +extern int __kaslr_enabled; +static inline int kaslr_enabled(void) +{ + if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) + return __kaslr_enabled; + return 0; +} + #define __PAGE_OFFSET 0x0UL #define PAGE_OFFSET 0x0UL diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index 03bcaa8effb2..32f70873e2b7 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h @@ -127,20 +127,6 @@ extern void (*_machine_restart)(char *command); extern void (*_machine_halt)(void); extern void (*_machine_power_off)(void); -extern unsigned long __kaslr_offset; -static inline unsigned long kaslr_offset(void) -{ - return __kaslr_offset; -} - -extern int __kaslr_enabled; -static inline int kaslr_enabled(void) -{ - if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) - return __kaslr_enabled; - return 0; -} - struct oldmem_data { unsigned long start; unsigned long size; |