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>

diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index 9381879f7ecf6c4c59097884b9135cb1b9a84559..602e8056b7cc945db8967f3ccd2636feacb00864 100644 (file)
--- 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 03bcaa8effb2222e4d88d2cda14cae6c861df113..32f70873e2b7d5bc31e48b0ce24da5e965e26dfe 100644 (file)
--- 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;