Commit bbe72f39 authored by Alexander Gordeev's avatar Alexander Gordeev
Browse files

s390/mm: Move KASLR related to <asm/page.h> 



Move everyting KASLR related to <asm/page.h>,
similarly to many other architectures.

Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Suggested-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent c8aef260

arch/s390/include/asm/page.h

+14 −0
Original line number Diff line number Diff line
@@ -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

arch/s390/include/asm/setup.h

+0 −14
Original line number Diff line number Diff line
@@ -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;